[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

CMakeLists.txt

@@ -556,8 +556,7 @@ if(runtime_cxxmodules)
     set(modules_idx_cmd COMMAND ${CMAKE_COMMAND} -E env PATH="${library_output_dir}\\\;%PATH%"
                                 ROOTIGNOREPREFIX=1 ROOT_HIST=0 $<TARGET_FILE:root.exe> -l -q -b)
   else()
-    set(modules_idx_cmd COMMAND ${ld_library_path}=${library_output_dir}:$ENV{${ld_library_path}}
-                                ROOT_INCLUDE_PATH=${DEFAULT_ROOT_INCLUDE_PATH}
+    set(modules_idx_cmd COMMAND ROOT_INCLUDE_PATH=${DEFAULT_ROOT_INCLUDE_PATH}
                                 ROOTIGNOREPREFIX=1 ROOT_HIST=0 $<TARGET_FILE:root.exe> -l -q -b)
   endif()
   add_custom_command(OUTPUT ${library_output_dir}/modules.idx
@@ -582,7 +581,7 @@ if(WIN32)
                           ROOT_INCLUDE_PATH=${DEFAULT_ROOT_INCLUDE_PATH}
                           ROOTIGNOREPREFIX=1 ROOT_HIST=0 $<TARGET_FILE:root.exe> -l -q -b -n -x ${CMAKE_SOURCE_DIR}/tutorials/hsimple.C -e return)
 else()
-  set(hsimple_cmd COMMAND ROOT_INCLUDE_PATH=${DEFAULT_ROOT_INCLUDE_PATH} ${ld_library_path}=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:$ENV{${ld_library_path}}
+  set(hsimple_cmd COMMAND ROOT_INCLUDE_PATH=${DEFAULT_ROOT_INCLUDE_PATH}
                           ROOTIGNOREPREFIX=1 ROOT_HIST=0 $<TARGET_FILE:root.exe> -l -q -b -n -x ${CMAKE_SOURCE_DIR}/tutorials/hsimple.C -e return)
 endif()
 add_custom_command(OUTPUT tutorials/hsimple.root

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

@@ -1884,7 +1884,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 +1909,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 +3137,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 +3391,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}

tutorials/CMakeLists.txt

@@ -18,7 +18,6 @@ if(DEFINED ROOT_SOURCE_DIR)  # Testing using the binary tree
   set(ROOT_root_CMD root.exe)
   if(NOT MSVC)  # Ignore environment on Windows
     set(ROOT_environ PATH=${CMAKE_BINARY_DIR}/bin:$ENV{PATH}
-                     ${ld_library_path}=${CMAKE_BINARY_DIR}/lib:$ENV{${ld_library_path}}
                      ROOTSYS=${CMAKE_BINARY_DIR}
                      ROOT_INCLUDE_PATH=${CMAKE_BINARY_DIR}/tutorials/io/tree:${DEFAULT_ROOT_INCLUDE_PATH}
                      PYTHONPATH=${CMAKE_BINARY_DIR}/lib:$ENV{PYTHONPATH})