Skip to content

[CMake] Don't set the PATH variable in any test environment #21014

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
guitargeek merged 1 commit into from
Jan 24, 2026
+24 −66
Merged

[CMake] Don't set the PATH variable in any test environment #21014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 22 additions & 46 deletions cmake/modules/RootMacros.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1966,18 +1966,14 @@ endfunction()
# ROOT_ADD_PYUNITTESTS( <name> )
#----------------------------------------------------------------------------
function(ROOT_ADD_PYUNITTESTS name)
if(MSVC)
set(ROOT_ENV
PYTHONPATH=${ROOTSYS}/bin;$ENV{PYTHONPATH})
else()
set(ROOT_ENV
PATH=${ROOTSYS}/bin:$ENV{PATH}
PYTHONPATH=${ROOTSYS}/lib:$ENV{PYTHONPATH})
endif()

set(pythonpaths ${localruntimedir} $ENV{PYTHONPATH})
cmake_path(CONVERT "${pythonpaths}" TO_NATIVE_PATH_LIST pythonpaths_native)

string(REGEX REPLACE "[_]" "-" good_name "${name}")
ROOT_ADD_TEST(pyunittests-${good_name}
COMMAND ${Python3_EXECUTABLE} -B -m unittest discover -s ${CMAKE_CURRENT_SOURCE_DIR} -p "*.py" -v
ENVIRONMENT ${ROOT_ENV})
ENVIRONMENT PYTHONPATH=${pythonpaths_native})
endfunction()

#----------------------------------------------------------------------------
Expand All @@ -1997,14 +1993,10 @@ function(ROOT_ADD_PYUNITTEST name file)
"COPY_TO_BUILDDIR;ENVIRONMENT;PYTHON_DEPS;FIXTURES_SETUP;FIXTURES_CLEANUP;FIXTURES_REQUIRED;PRECMD;POSTCMD"
${ARGN}
)
if(MSVC)
set(ROOT_ENV
PYTHONPATH=${ROOTSYS}/bin;$ENV{PYTHONPATH})
else()
set(ROOT_ENV
PATH=${ROOTSYS}/bin:$ENV{PATH}
PYTHONPATH=${ROOTSYS}/lib:$ENV{PYTHONPATH})
endif()

set(pythonpaths ${localruntimedir} $ENV{PYTHONPATH})
cmake_path(CONVERT "${pythonpaths}" TO_NATIVE_PATH_LIST pythonpaths_native)

string(REGEX REPLACE "[_]" "-" good_name "${name}")
get_filename_component(file_name ${file} NAME)
get_filename_component(file_dir ${file} DIRECTORY)
Expand Down Expand Up @@ -2048,7 +2040,7 @@ function(ROOT_ADD_PYUNITTEST name file)
set(test_name pyunittests${clean_name_with_path})
ROOT_ADD_TEST(${test_name}
${test_cmd}
ENVIRONMENT ${ROOT_ENV} ${ARG_ENVIRONMENT}
ENVIRONMENT PYTHONPATH=${pythonpaths_native} ${ARG_ENVIRONMENT}
LABELS ${labels}
${copy_to_builddir}
${will_fail}
Expand Down Expand Up @@ -3237,22 +3229,13 @@ function(ROOTTEST_ADD_TEST testname)
set(run_serial RUN_SERIAL ${ARG_RUN_SERIAL})
endif()

if(MSVC)
set(environment ENVIRONMENT
${ROOTTEST_ENV_EXTRA}
${ARG_ENVIRONMENT}
PYTHONPATH=${ROOTTEST_ENV_PYTHONPATH})
else()
string(REPLACE ";" ":" _path "${ROOTTEST_ENV_PATH}")
string(REPLACE ";" ":" _pythonpath "${ROOTTEST_ENV_PYTHONPATH}")
set(pythonpaths ${localruntimedir} $ENV{PYTHONPATH})
cmake_path(CONVERT "${pythonpaths}" TO_NATIVE_PATH_LIST pythonpaths_native)


set(environment ENVIRONMENT
${ROOTTEST_ENV_EXTRA}
${ARG_ENVIRONMENT}
PATH=${_path}:$ENV{PATH}
PYTHONPATH=${_pythonpath}:$ENV{PYTHONPATH})
endif()
set(environment ENVIRONMENT
${ROOTTEST_ENV_EXTRA}
${ARG_ENVIRONMENT}
PYTHONPATH=${pythonpaths_native})

if(ARG_WORKING_DIR)
get_filename_component(test_working_dir ${ARG_WORKING_DIR} ABSOLUTE)
Expand Down Expand Up @@ -3490,20 +3473,13 @@ function(ROOTTEST_ADD_UNITTEST_DIR)
endforeach()
endif(ARG_DEPENDS)

if(MSVC)
set(environment ENVIRONMENT
PYTHONPATH=${ROOTTEST_ENV_PYTHONPATH})
else()
string(REPLACE ";" ":" _path "${ROOTTEST_ENV_PATH}")
string(REPLACE ";" ":" _pythonpath "${ROOTTEST_ENV_PYTHONPATH}")
set(pythonpaths ${localruntimedir} $ENV{PYTHONPATH})
cmake_path(CONVERT "${pythonpaths}" TO_NATIVE_PATH_LIST pythonpaths_native)


set(environment ENVIRONMENT
${ROOTTEST_ENV_EXTRA}
${ARG_ENVIRONMENT}
PATH=${_path}:$ENV{PATH}
PYTHONPATH=${_pythonpath}:$ENV{PYTHONPATH})
endif()
set(environment ENVIRONMENT
${ROOTTEST_ENV_EXTRA}
${ARG_ENVIRONMENT}
PYTHONPATH=${pythonpaths_native})

ROOT_ADD_TEST(${fulltestname} COMMAND ${binary}
${environment}
Expand Down
22 changes: 2 additions & 20 deletions roottest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,26 +89,8 @@ else()
endif()

# Setup environment.
set(ROOTTEST_ENV_PATH ${ROOT_BINDIR})
if(MSVC)
set(ROOTTEST_ENV_PYTHONPATH ${ROOT_BINDIR})
else()
set(ROOTTEST_ENV_PYTHONPATH ${ROOT_LIBRARY_DIR})
endif()
set(ROOTTEST_ENV_EXTRA)

if(MSVC)
set(ROOTTEST_ENVIRONMENT
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
PATH=${ROOTTEST_ENV_PATH}:$ENV{PATH}
PYTHONPATH=${TESTPYTHONPATH})
if (gnuinstall)
set(ROOTTEST_ENVIRONMENT ${ROOTTEST_ENVIRONMENT} ROOTIGNOREPREFIX=1)
endif()
if (gnuinstall)
set(ROOTTEST_ENVIRONMENT ROOTIGNOREPREFIX=1)
endif()

# Set some variables that customizes the behaviour of the ROOT macros
Expand Down
Loading