diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-11-22 18:57:52 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-11-22 18:58:20 +0100 |
| commit | 35f0a01b5e320ef3a5f0c82e24ecf889d8f9d455 (patch) | |
| tree | 95023236804f60229c5166689e0b0874c12a5e63 /solenv | |
| parent | bd21de41e30e47f7d1c2ff6d4bdcc4a7f0e72103 (diff) | |
Further && vs. ; clean-up
Change-Id: Ie4cb4113e98661d5c4b31a60ce1826b273c3cbc0
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index f3c084737121..993757dc34d4 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -91,11 +91,10 @@ $(call gb_CppunitTest_get_target,%) :| $(gb_CppunitTest_CPPTESTDEPS) $(call gb_CppunitTest__make_args) \ $(if $(gb_CppunitTest__interactive),, \ > $@.log 2>&1 \ - || (RET=$$? \ - $(if $(value gb_CppunitTest_postprocess), \ - && $(call gb_CppunitTest_postprocess,$(gb_CppunitTest_CPPTESTCOMMAND),$@.core,$$RET) >> $@.log 2>&1) \ - ; cat $@.log && $(call gb_UNIT_FAILED_MSG,Cppunit,$*) \ - && false)))) + || ($(if $(value gb_CppunitTest_postprocess), \ + RET=$$?; \ + $(call gb_CppunitTest_postprocess,$(gb_CppunitTest_CPPTESTCOMMAND),$@.core,$$RET) >> $@.log 2>&1;) \ + cat $@.log; $(call gb_UNIT_FAILED_MSG,Cppunit,$*); false)))) define gb_CppunitTest_CppunitTest $(call gb_CppunitTest__CppunitTest_impl,$(1),$(call gb_CppunitTest_get_linktarget,$(1))) |