[Libreoffice-commits] .: solenv/gbuild

[Libreoffice Gerrit user]

 solenv/gbuild/CppunitTest.mk |    6 ------
 1 file changed, 6 deletions(-)

New commits:
commit 87f2e713ea819d1e36084ba7813ee6671237206c
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Thu Jan 3 17:50:43 2013 +0100

    do not set LD_LIBRARY_PATH twice for unittests at all
    
    It is already set by gb_CppunitTest_CPPTESTPRECOMMAND (or should be),
    and doing it here again causes problems avoided
    by 265feeb31ffc08cd4ccbe48398cd41d9cf1e2a25 , or when ICECREAM_RUN is set.
    
    Change-Id: I5ebe8ad735ea6ff8cb1c205c55c45b93550c8b55

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 47c8687..e578dc03 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -53,13 +53,7 @@ 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)
-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))