[CMake] Don't set ROOTSYS in test macros

ROOT should optimally work even without setting specific environment
variables.

Author: guitargeek

bindings/tpython/test/CMakeLists.txt

@@ -10,10 +10,10 @@
 # because we are using PyROOT from C++. This environment mimics the one used in
 # ROOT_ADD_PYUNITTEST.
 if(MSVC)
-  set(tpython_gtest_env ROOTSYS=${ROOTSYS}
+  set(tpython_gtest_env
       PYTHONPATH=${ROOTSYS}/bin;$ENV{PYTHONPATH})
 else()
-  set(tpython_gtest_env ROOTSYS=${ROOTSYS}
+  set(tpython_gtest_env
       PATH=${ROOTSYS}/bin:$ENV{PATH}
       LD_LIBRARY_PATH=${ROOTSYS}/lib:$ENV{LD_LIBRARY_PATH}
       PYTHONPATH=${ROOTSYS}/lib:$ENV{PYTHONPATH})

cmake/modules/RootMacros.cmake

@@ -1879,10 +1879,10 @@ endfunction()
 #----------------------------------------------------------------------------
 function(ROOT_ADD_PYUNITTESTS name)
   if(MSVC)
-    set(ROOT_ENV ROOTSYS=${ROOTSYS}
+    set(ROOT_ENV
         PYTHONPATH=${ROOTSYS}/bin;$ENV{PYTHONPATH})
   else()
-    set(ROOT_ENV ROOTSYS=${ROOTSYS}
+    set(ROOT_ENV
         PATH=${ROOTSYS}/bin:$ENV{PATH}
         ${ld_library_path}=${ROOTSYS}/lib:$ENV{${ld_library_path}}
         PYTHONPATH=${ROOTSYS}/lib:$ENV{PYTHONPATH})
@@ -1905,10 +1905,10 @@ endfunction()
 function(ROOT_ADD_PYUNITTEST name file)
   CMAKE_PARSE_ARGUMENTS(ARG "WILLFAIL;GENERIC" "" "COPY_TO_BUILDDIR;ENVIRONMENT;PYTHON_DEPS;FIXTURES_SETUP;FIXTURES_CLEANUP;FIXTURES_REQUIRED" ${ARGN})
   if(MSVC)
-    set(ROOT_ENV ROOTSYS=${ROOTSYS}
+    set(ROOT_ENV
         PYTHONPATH=${ROOTSYS}/bin;$ENV{PYTHONPATH})
   else()
-    set(ROOT_ENV ROOTSYS=${ROOTSYS}
+    set(ROOT_ENV
         PATH=${ROOTSYS}/bin:$ENV{PATH}
         ${ld_library_path}=${ROOTSYS}/lib:$ENV{${ld_library_path}}
         PYTHONPATH=${ROOTSYS}/lib:$ENV{PYTHONPATH})
@@ -3126,7 +3126,6 @@ function(ROOTTEST_ADD_TEST testname)
     set(environment ENVIRONMENT
                     ${ROOTTEST_ENV_EXTRA}
                     ${ARG_ENVIRONMENT}
-                    ROOTSYS=${ROOTSYS}
                     PYTHONPATH=${ROOTTEST_ENV_PYTHONPATH})
   else()
     string(REPLACE ";" ":" _path "${ROOTTEST_ENV_PATH}")
@@ -3137,7 +3136,6 @@ function(ROOTTEST_ADD_TEST testname)
     set(environment ENVIRONMENT
                     ${ROOTTEST_ENV_EXTRA}
                     ${ARG_ENVIRONMENT}
-                    ROOTSYS=${ROOTSYS}
                     PATH=${_path}:$ENV{PATH}
                     PYTHONPATH=${_pythonpath}:$ENV{PYTHONPATH}
                     ${ld_library_path}=${_librarypath}:$ENV{${ld_library_path}})
@@ -3381,7 +3379,6 @@ function(ROOTTEST_ADD_UNITTEST_DIR)
 
   if(MSVC)
     set(environment ENVIRONMENT
-                    ROOTSYS=${ROOTSYS}
                     PYTHONPATH=${ROOTTEST_ENV_PYTHONPATH})
   else()
     string(REPLACE ";" ":" _path "${ROOTTEST_ENV_PATH}")
@@ -3392,7 +3389,6 @@ function(ROOTTEST_ADD_UNITTEST_DIR)
     set(environment ENVIRONMENT
                     ${ROOTTEST_ENV_EXTRA}
                     ${ARG_ENVIRONMENT}
-                    ROOTSYS=${ROOTSYS}
                     PATH=${_path}:$ENV{PATH}
                     PYTHONPATH=${_pythonpath}:$ENV{PYTHONPATH}
                     ${ld_library_path}=${_librarypath}:$ENV{${ld_library_path}})

roottest/CMakeLists.txt

@@ -251,13 +251,11 @@ endif()
 
 if(MSVC)
   set(ROOTTEST_ENVIRONMENT
-      ROOTSYS=${ROOTSYS}
       PYTHONPATH=${ROOTTEST_ENV_PYTHONPATH})
 else()
   # `PYTHONPATH=...:` (trailing `:`) kills roottest/python/stl/PyROOT_stltests.py.
   string(REGEX REPLACE ":$" "" TESTPYTHONPATH "${ROOTTEST_ENV_PYTHONPATH}:$ENV{PYTHONPATH}")
   set(ROOTTEST_ENVIRONMENT
-      ROOTSYS=${ROOTSYS}
       PATH=${ROOTTEST_ENV_PATH}:$ENV{PATH}
       PYTHONPATH=${TESTPYTHONPATH}
       ${ld_library_path}=${ROOTTEST_ENV_LIBRARYPATH}:$ENV{${ld_library_path}})

roottest/root/rint/driveTabCom.py

@@ -5,7 +5,7 @@
 # Create a tty: master is our side, slave is what we pass as Popen's stdin.
 # This makes ROOT believe that its stdin is a tty.
 master, slave = pty.openpty()
-cmd = [os.environ['ROOTSYS'] + '/bin/root.exe', '-b', '-l']
+cmd = ['root.exe', '-b', '-l']
 proc = subprocess.Popen(cmd,
                         stdin = slave,
                         stdout = slave,

tutorials/CMakeLists.txt

@@ -19,12 +19,10 @@ if(DEFINED ROOT_SOURCE_DIR)  # Testing using the binary tree
   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})
   else()
-    set(ROOT_environ ROOTSYS=${CMAKE_BINARY_DIR}
-                     ROOT_INCLUDE_PATH=${CMAKE_BINARY_DIR}/tutorials/io/tree:${DEFAULT_ROOT_INCLUDE_PATH}
+    set(ROOT_environ ROOT_INCLUDE_PATH=${CMAKE_BINARY_DIR}/tutorials/io/tree:${DEFAULT_ROOT_INCLUDE_PATH}
                      PYTHONPATH=${CMAKE_BINARY_DIR}/bin;$ENV{PYTHONPATH})
   endif()
 else()                       # testing using an installation