[PATCH] fix 'DEBUGCPPUNIT=TRUE make subsequenttest'

[Noel Grandin (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/1532

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/32/1532/1

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
---
M solenv/gbuild/CppunitTest.mk
1 file changed, 7 insertions(+), 1 deletion(-)



diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 9c145b6..47c8687 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -53,7 +53,13 @@
 # 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)
 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
 
 gb_CppunitTest__get_linktargetname = CppunitTest/$(call gb_CppunitTest_get_filename,$(1))

-- 
To view, visit https://gerrit.libreoffice.org/1532
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If3f81ba3fc3e5260142d7e9c2d4a78e9ca63382c
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Noel Grandin <noelgrandin at gmail.com>