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

Christian Lohmaier lohmaier+LibreOffice at googlemail.com
Fri Nov 22 09:02:55 PST 2013


 solenv/gbuild/CppunitTest.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3176c11305be4f930159b8404c188cb5d29ecf75
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Fri Nov 22 18:00:07 2013 +0100

    always cat cppunit test log on failure
    
    and not only when gdb is installed / the postprocess script succeeds
    
    Change-Id: I36e2fcdb81296252d7402d77154e45614cb70038

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 7ebfc07..f3c0847 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -94,7 +94,7 @@ $(call gb_CppunitTest_get_target,%) :| $(gb_CppunitTest_CPPTESTDEPS)
 			|| (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,$*) \
+				; cat $@.log && $(call gb_UNIT_FAILED_MSG,Cppunit,$*) \
 				&& false))))
 
 define gb_CppunitTest_CppunitTest


More information about the Libreoffice-commits mailing list