diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-09-09 12:05:43 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-09-09 17:46:36 +0200 |
| commit | 34e5e5ecec9779bae3ee48f698d52318f0be5f89 (patch) | |
| tree | ca0f6ecc1f5f7afc685033430a13c9ab0001852c /solenv | |
| parent | 57d28ffd21e29d05084b16f8013eef7790403d72 (diff) | |
sb140: #i117081# solenv/gbuilt/{Cpp,J}unitTest.mk typos
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/JunitTest.mk | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 220b2604184b..cdfe4f0bb6be 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -86,7 +86,7 @@ $(call gb_CppunitTest_get_target,%) :| $(gb_CppunitTest_CPPTESTTARGET) $(call gb_Output_announce,$*,$(true),CUT,2) $(call gb_Helper_abbreviate_dirs_native,\ mkdir -p $(dir $@) && \ - $(gb_CppunitTest_CPPTESTCOMMAND) $(call gb_LinkTarget_get_target,CppunitTest/$(call gb_CppunitTest_get_libfilename,$*)) $(call gb_CppunitTest__make_args,$(ARGS),$(UNO_SERVICES),$(UNO_TYPES)) $(if $(gb_CppunitTest__interactive),,> $@.log 2>&1 || (cat $@.log && false))) + ($(gb_CppunitTest_CPPTESTCOMMAND) $(call gb_LinkTarget_get_target,CppunitTest/$(call gb_CppunitTest_get_libfilename,$*)) $(call gb_CppunitTest__make_args,$(ARGS),$(UNO_SERVICES),$(UNO_TYPES)) $(if $(gb_CppunitTest__interactive),,> $@.log 2>&1 || (cat $@.log && false)))) define gb_CppunitTest_CppunitTest $(call gb_CppunitTest__CppunitTest_impl,$(1),$(call gb_CppunitTest__get_linktargetname,$(1))) diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index 699f1a68f2a0..a93576cff168 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -49,7 +49,7 @@ $(call gb_JunitTest_get_target,%) : $(call gb_Helper_abbreviate_dirs_native,\ rm -rf $(call gb_JunitTest_get_userdir,$*) && \ mkdir -p $(call gb_JunitTest_get_userdir,$*) && \ - $(gb_JunitTest_JAVACOMMAND) \ + ($(gb_JunitTest_JAVACOMMAND) \ -cp "$(CLASSPATH)" \ $(if $(strip $(gb_JunitTest_HEADLESS)),\ -Dorg.openoffice.test.arg.headless=$(gb_JunitTest_HEADLESS)) \ @@ -57,7 +57,7 @@ $(call gb_JunitTest_get_target,%) : '-Dorg.openoffice.test.arg.debugcommand=$(gb_JunitTest_DEBUGCOMMAND)') \ $(DEFS) \ org.junit.runner.JUnitCore \ - $(CLASSES) 2>&1 > $@.log || (cat $@.log && false) && \ + $(CLASSES) 2>&1 > $@.log || (cat $@.log && false)) && \ rm -rf $(call gb_JunitTest_get_userdir,$*)) $(CLEAN_CMD) |