summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-06-03 11:42:30 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-06-04 08:55:11 +0200
commit127bfe4afedabd729832c05cbe0232e76cf15863 (patch)
treee1e18d7766cdb7f7cb94d221c88b80ae74d76e01 /solenv
parent982820640865addb921e32b26d9aae3c3b3a10d7 (diff)
Include gdb backtrace in PythonTest done.long (just as for CppunitTest)
Change-Id: Idc671a4af5474443130afed2dd6f0728c1504319
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/PythonTest.mk10
1 files changed, 4 insertions, 6 deletions
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