Skip to content

C
core
Kaydet (Commit) 87f2e713 authored tarafından Luboš Luňák's avatar Luboš Luňák
Dosyalara gözat
Seçenekler

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 265feeb3 , or when ICECREAM_RUN is set.

Change-Id: I5ebe8ad735ea6ff8cb1c205c55c45b93550c8b55
üst 5bc348ae
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 6 deletions
solenv/gbuild/CppunitTest.mk
Dosyayı görüntüle @ 87f2e713
...@@ -53,13 +53,7 @@ endif ...@@ -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 # 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)
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) 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