solenv/gbuild/CppunitTest.mk | 2 +-
solenv/gbuild/platform/com_GCC_class.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 78f8e6f4eb8191eebcc4d5c5e6335ef248b43869
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Sep 24 10:27:39 2020 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Thu Sep 24 13:46:54 2020 +0200
Move some settings from just DEBUGCPPUNIT to all gdb CPPUNITTRACE
For one, it is probably a good idea to always (a) return the tested process'
exit code, and (b) help users without a proper .gdbinit by setting
auto-load-safe-path. And for another, this change works towards the goal of
implementing DEBUGCPPUNIT as a special case of CPPUNITTRACE, ultimately
simplifying the setting of gb_CppunitTest_GDBTRACE.
Change-Id: I186434fa8645d8b068c69dbcfedf9b7d6374f99c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103297
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 1c0e8d3dfe93..612a89286935 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -27,7 +27,7 @@ ifneq ($(strip $(CPPUNITTRACE)),)
ifneq ($(filter gdb,$(CPPUNITTRACE)),)
# sneak (a) setting the LD_LIBRARY_PATH, and (b) setting malloc debug flags,
into the "gdb --args" command line
gb_CppunitTest_GDBTRACE := $(subst gdb,\
- gdb -ex "set environment $(subst =,
,$(gb_CppunitTest_CPPTESTPRECOMMAND))" $(gb_CppunitTest_malloc_check),\
+ gdb -return-child-result -ex "add-auto-load-safe-path $(INSTDIR)" -ex
"set environment $(subst =, ,$(gb_CppunitTest_CPPTESTPRECOMMAND))"
$(gb_CppunitTest_malloc_check),\
$(CPPUNITTRACE))
else ifneq ($(filter lldb,$(CPPUNITTRACE)),)
gb_CppunitTest_PREGDBTRACE := lo_dyldpathfile=$(call var2file,$(shell
$(gb_MKTEMP)),500,settings set target.env-vars
$(gb_CppunitTest_CPPTESTPRECOMMAND))
diff --git a/solenv/gbuild/platform/com_GCC_class.mk
b/solenv/gbuild/platform/com_GCC_class.mk
index 93f750c4ce56..ea4f69efcd35 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -194,7 +194,7 @@ endef
# CppunitTest class
ifeq ($(strip $(DEBUGCPPUNIT)),TRUE)
-gb_CppunitTest_GDBTRACE := gdb -nx -ex "add-auto-load-safe-path $(INSTDIR)"
-ex "set environment $(subst =, ,$(gb_CppunitTest_CPPTESTPRECOMMAND))" --batch
--command=$(SRCDIR)/solenv/bin/gdbtrycatchtrace-stdout -return-child-result
--args
+gb_CppunitTest_GDBTRACE := gdb -nx -ex "set environment $(subst =,
,$(gb_CppunitTest_CPPTESTPRECOMMAND))" --batch
--command=$(SRCDIR)/solenv/bin/gdbtrycatchtrace-stdout --args
endif
# ExternalProject class
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
