From 127bfe4afedabd729832c05cbe0232e76cf15863 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Tue, 3 Jun 2014 11:42:30 +0200
Subject: Include gdb backtrace in PythonTest done.long (just as for
 CppunitTest)

Change-Id: Idc671a4af5474443130afed2dd6f0728c1504319
---
 solenv/gbuild/PythonTest.mk | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'solenv')

diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk
index c0a1f2f1271f..ce5f5ed0e564 100644
--- a/solenv/gbuild/PythonTest.mk
+++ b/solenv/gbuild/PythonTest.mk
@@ -33,8 +33,6 @@ $(call gb_PythonTest_get_clean_target,%) :
 
 ifneq ($(DISABLE_PYTHON),TRUE)
 
-# pass a hard-coded 139 to the gdb postprocess script to match soffice.bin
-# signal exit values (assumption: non-0 exit value here means it crashed)
 .PHONY : $(call gb_PythonTest_get_target,%)
 $(call gb_PythonTest_get_target,%) :| $(gb_PythonTest_DEPS)
 	$(call gb_Output_announce,$*,$(true),PYT,2)
@@ -58,10 +56,10 @@ $(call gb_PythonTest_get_target,%) :| $(gb_PythonTest_DEPS)
 			$(MODULES) \
 		$(if $(gb_CppunitTest__interactive),, \
 			> $@.log 2>&1 \
-			|| (cat $@.log \
-				$(if $(value gb_CppunitTest_postprocess), \
-					&& $(call gb_CppunitTest_postprocess,$(gb_PythonTest_EXECUTABLE_GDB),$@.core,139)) \
-				&& $(SRCDIR)/solenv/bin/unittest-failed.sh Python $*))))
+			|| ($(if $(value gb_CppunitTest_postprocess), \
+					RET=$$?; \
+					$(call gb_CppunitTest_postprocess,$(gb_PythonTest_EXECUTABLE_GDB),$@.core,$$RET) >> $@.log 2>&1;) \
+				cat $@.log; $(SRCDIR)/solenv/bin/unittest-failed.sh Python $*))))
 
 # always use udkapi and URE services
 define gb_PythonTest_PythonTest
-- 
cgit