[CMake] Don't set LD_LIBRARY_PATH in test macros

This should not be needed anymore because of the runpath mechanism, and
by leaving it out from the test environment we are making sure that this
keeps working.

Author: guitargeek

bindings/tpython/test/CMakeLists.txt

@@ -14,8 +14,6 @@ if(MSVC)
       PYTHONPATH=${ROOTSYS}/bin;$ENV{PYTHONPATH})
 else()
   set(tpython_gtest_env ROOTSYS=${ROOTSYS}
-      PATH=${ROOTSYS}/bin:$ENV{PATH}
-      LD_LIBRARY_PATH=${ROOTSYS}/lib:$ENV{LD_LIBRARY_PATH}
       PYTHONPATH=${ROOTSYS}/lib:$ENV{PYTHONPATH})
 endif()
 

cmake/modules/RootMacros.cmake

@@ -10,12 +10,10 @@
 
 if(WIN32)
   set(libprefix lib)
-  set(ld_library_path PATH)
   set(libsuffix .dll)
   set(localruntimedir ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
   set(runtimedir ${CMAKE_INSTALL_BINDIR})
 elseif(APPLE)
-  set(ld_library_path DYLD_LIBRARY_PATH)
   set(ld_preload DYLD_INSERT_LIBRARIES)
   set(libprefix ${CMAKE_SHARED_LIBRARY_PREFIX})
   if(CMAKE_PROJECT_NAME STREQUAL ROOT)
@@ -26,7 +24,6 @@ elseif(APPLE)
   set(localruntimedir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
   set(runtimedir ${CMAKE_INSTALL_PYTHONDIR})
 else()
-  set(ld_library_path LD_LIBRARY_PATH)
   set(ld_preload LD_PRELOAD)
   set(libprefix ${CMAKE_SHARED_LIBRARY_PREFIX})
   set(libsuffix ${CMAKE_SHARED_LIBRARY_SUFFIX})
@@ -1884,7 +1881,6 @@ function(ROOT_ADD_PYUNITTESTS name)
   else()
     set(ROOT_ENV ROOTSYS=${ROOTSYS}
         PATH=${ROOTSYS}/bin:$ENV{PATH}
-        ${ld_library_path}=${ROOTSYS}/lib:$ENV{${ld_library_path}}
         PYTHONPATH=${ROOTSYS}/lib:$ENV{PYTHONPATH})
   endif()
   string(REGEX REPLACE "[_]" "-" good_name "${name}")
@@ -1910,7 +1906,6 @@ function(ROOT_ADD_PYUNITTEST name file)
   else()
     set(ROOT_ENV ROOTSYS=${ROOTSYS}
         PATH=${ROOTSYS}/bin:$ENV{PATH}
-        ${ld_library_path}=${ROOTSYS}/lib:$ENV{${ld_library_path}}
         PYTHONPATH=${ROOTSYS}/lib:$ENV{PYTHONPATH})
   endif()
   string(REGEX REPLACE "[_]" "-" good_name "${name}")
@@ -3139,8 +3134,7 @@ function(ROOTTEST_ADD_TEST testname)
                     ${ARG_ENVIRONMENT}
                     ROOTSYS=${ROOTSYS}
                     PATH=${_path}:$ENV{PATH}
-                    PYTHONPATH=${_pythonpath}:$ENV{PYTHONPATH}
-                    ${ld_library_path}=${_librarypath}:$ENV{${ld_library_path}})
+                    PYTHONPATH=${_pythonpath}:$ENV{PYTHONPATH})
   endif()
 
   if(ARG_WORKING_DIR)
@@ -3394,8 +3388,7 @@ function(ROOTTEST_ADD_UNITTEST_DIR)
                     ${ARG_ENVIRONMENT}
                     ROOTSYS=${ROOTSYS}
                     PATH=${_path}:$ENV{PATH}
-                    PYTHONPATH=${_pythonpath}:$ENV{PYTHONPATH}
-                    ${ld_library_path}=${_librarypath}:$ENV{${ld_library_path}})
+                    PYTHONPATH=${_pythonpath}:$ENV{PYTHONPATH})
   endif()
 
   ROOT_ADD_TEST(${fulltestname} COMMAND ${binary}