Kaydet (Commit) 265feeb3 authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Tor Lillqvist

fix 'DEBUGCPPUNIT=TRUE make subsequenttest'

When running a unit test under GDB, we do not want to prefix the
cppunittester executable with the LD_LIBRARY_PATH, because that has
already happened before the "gdb --args" part of the command line.

Change-Id: If3f81ba3fc3e5260142d7e9c2d4a78e9ca63382c
Reviewed-on: https://gerrit.libreoffice.org/1532Reviewed-by: 's avatarTor Lillqvist <tml@iki.fi>
Tested-by: 's avatarTor Lillqvist <tml@iki.fi>
üst 25213655
...@@ -53,7 +53,13 @@ endif ...@@ -53,7 +53,13 @@ endif
# DBGSV_ERROR_OUT => in non-product builds, ensure that tools-based assertions do not pop up as message box, but are routed to the shell # DBGSV_ERROR_OUT => in non-product builds, ensure that tools-based assertions do not pop up as message box, but are routed to the shell
ifneq ($(CROSS_COMPILING),YES) ifneq ($(CROSS_COMPILING),YES)
gb_CppunitTest_CPPTESTDEPS := $(call gb_Executable_get_runtime_dependencies,cppunit/cppunittester) gb_CppunitTest_CPPTESTDEPS := $(call gb_Executable_get_runtime_dependencies,cppunit/cppunittester)
gb_CppunitTest_CPPTESTCOMMAND := $(call gb_Executable_get_command,cppunit/cppunittester) ifeq ($(strip $(DEBUGCPPUNIT)),TRUE)
gb_CppunitTest_CPPTESTCOMMAND := $(call gb_Executable_get_target_for_build,cppunit/cppunittester)
else ifneq ($(strip $(GDBCPPUNITTRACE)),)
gb_CppunitTest_CPPTESTCOMMAND := $(call gb_Executable_get_target_for_build,cppunit/cppunittester)
else
gb_CppunitTest_CPPTESTCOMMAND := $(gb_Helper_set_ld_path) $(call gb_Executable_get_target_for_build,cppunit/cppunittester)
endif
endif endif
gb_CppunitTest__get_linktargetname = CppunitTest/$(call gb_CppunitTest_get_filename,$(1)) gb_CppunitTest__get_linktargetname = CppunitTest/$(call gb_CppunitTest_get_filename,$(1))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment