[Libreoffice-commits] core.git: solenv/gbuild

[Stephan Bergmann]

 solenv/gbuild/CppunitTest.mk |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 1b20921ae00609fd4a2cd5a5241083b886a45346
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Nov 7 15:57:05 2013 +0100

    Include backtrace in log
    
    Change-Id: I76306ac61365282ef2de4869c1c8e21e044304ff

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index f5ab797..7ebfc07 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -91,9 +91,10 @@ $(call gb_CppunitTest_get_target,%) :| $(gb_CppunitTest_CPPTESTDEPS)
 		$(call gb_CppunitTest__make_args) \
 		$(if $(gb_CppunitTest__interactive),, \
 			> $@.log 2>&1 \
-			|| (RET=$$? && cat $@.log && $(call gb_UNIT_FAILED_MSG,Cppunit,$*) \
+			|| (RET=$$? \
 				$(if $(value gb_CppunitTest_postprocess), \
-					&& $(call gb_CppunitTest_postprocess,$(gb_CppunitTest_CPPTESTCOMMAND),$@.core,$$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