solenv/gbuild/CppunitTest.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
New commits: commit 265feeb31ffc08cd4ccbe48398cd41d9cf1e2a25 Author: Noel Grandin <[email protected]> Date: Wed Jan 2 13:32:09 2013 +0200 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 <[email protected]> Tested-by: Tor Lillqvist <[email protected]> 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 @@ 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)) _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
