diff options
| author | Noel Grandin <noel@peralex.com> | 2013-01-02 13:32:09 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-01-02 12:07:38 +0000 |
| commit | 265feeb31ffc08cd4ccbe48398cd41d9cf1e2a25 (patch) | |
| tree | 58b22b31095ce033c577c5f4adc292d880a167e6 /solenv/gbuild/CppunitTest.mk | |
| parent | 252136551f2c032b62f9650a06389f2b4fe6e6c1 (diff) | |
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/1532
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
Diffstat (limited to 'solenv/gbuild/CppunitTest.mk')
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 9c145b637a74..47c8687dbefb 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -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 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)) |