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

[Stephan Bergmann]

 solenv/gbuild/UITest.mk |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 48f64e974c8e7fed62e32d885ed6457d961da638
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jun 28 13:04:52 2017 +0200

    Try to get meaningful gdb backtraces for failed UITest core files after all
    
    Change-Id: I6487eabdc0d6c84e919dff0f330bbc36a19f9da3

diff --git a/solenv/gbuild/UITest.mk b/solenv/gbuild/UITest.mk
index 67004b29af21..016636cd8858 100644
--- a/solenv/gbuild/UITest.mk
+++ b/solenv/gbuild/UITest.mk
@@ -13,14 +13,18 @@ gb_UITest_UNITTESTFAILED ?= $(GBUILDDIR)/platform/unittest-failed-default.sh
 
 ifeq ($(SYSTEM_PYTHON),)
 gb_UITest_EXECUTABLE := $(gb_Python_INSTALLED_EXECUTABLE)
-gb_UITest_EXECUTABLE_GDB := $(gb_Python_INSTALLED_EXECUTABLE_GDB)
 gb_UITest_DEPS ?= $(call gb_Package_get_target,python3)
 else
 gb_UITest_EXECUTABLE := $(PYTHON_FOR_BUILD)
-gb_UITest_EXECUTABLE_GDB := $(PYTHON_FOR_BUILD)
 gb_UITest_DEPS :=
 endif
 
+# UITests are much more likely to generate core files for the soffice than for
+# the python executale, but solenv/bin/gdb-core-bt.sh is often unable to
+# determine the executable that generated a core file, so make it fall back to
+# the soffice executable rather than to gb_UITest_EXECUTABLE:
+gb_UITest_EXECUTABLE_GDB := $(call gb_Executable_get_target,soffice_bin)
+
 ifneq ($(strip $(UITESTTRACE)),)
 gb_UITest_GDBTRACE := --gdb
 gb_UITest__interactive := $(true)