diff options
| author | David Tardon <dtardon@redhat.com> | 2012-04-08 15:19:08 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-04-08 15:19:08 +0200 |
| commit | e27674781a99faff65db42bc20eeffb8ef5596ae (patch) | |
| tree | c1eb13b955ebab8a09a7644a45ad14eda7c3dec6 /solenv/gbuild/CppunitTest.mk | |
| parent | 5fcacd84082b039c4c2d6f3470d51b3c49b3110c (diff) | |
only add -env: args for tests that use URE
Diffstat (limited to 'solenv/gbuild/CppunitTest.mk')
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 862e3b8f1439..2fb3411942d1 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -59,16 +59,16 @@ gb_CppunitTest__get_linktargetname = CppunitTest/$(call gb_CppunitTest_get_filen define gb_CppunitTest__make_args --headless \ -$(if $(strip $(CONFIGURATION_LAYERS)),\ - "-env:CONFIGURATION_LAYERS=$(strip $(CONFIGURATION_LAYERS))") \ -$(if $(strip $(UNO_TYPES)),\ - "-env:UNO_TYPES=$(foreach item,$(UNO_TYPES),$(call gb_Helper_make_url,$(item)))") \ -$(if $(strip $(UNO_SERVICES)),\ - "-env:UNO_SERVICES=$(foreach item,$(UNO_SERVICES),$(call gb_Helper_make_url,$(item)))") \ $(if $(URE),\ - $(foreach dir,URE_INTERNAL_LIB_DIR LO_LIB_DIR,\ - -env:$(dir)=$(call gb_Helper_make_url,$(gb_CppunitTest_LIBDIR))) \ - --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector) \ + $(if $(strip $(CONFIGURATION_LAYERS)),\ + "-env:CONFIGURATION_LAYERS=$(strip $(CONFIGURATION_LAYERS))") \ + $(if $(strip $(UNO_TYPES)),\ + "-env:UNO_TYPES=$(foreach item,$(UNO_TYPES),$(call gb_Helper_make_url,$(item)))") \ + $(if $(strip $(UNO_SERVICES)),\ + "-env:UNO_SERVICES=$(foreach item,$(UNO_SERVICES),$(call gb_Helper_make_url,$(item)))") \ + $(foreach dir,URE_INTERNAL_LIB_DIR LO_LIB_DIR,\ + -env:$(dir)=$(call gb_Helper_make_url,$(gb_CppunitTest_LIBDIR))) \ + --protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector) \ $(ARGS) endef |