Skip to content

Fix tests failing in Gentoo #22166

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

Open
hageboeck wants to merge 3 commits into
base: master
Choose a base branch
from
+15 −9
Open

Fix tests failing in Gentoo #22166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
101be7e
[python] Whitelist Gentoo's sandbox library in import_load_libs
hageboeck May 6, 2026
ec062a1
[roottest] Fix a failing cling test.
hageboeck May 6, 2026
c5a24e8
[roottest] Fix a compilation failure triggered by environment variables.
hageboeck May 8, 2026
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
1 change: 1 addition & 0 deletions bindings/pyroot/pythonizations/test/import_load_libs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ class ImportLoadLibs(unittest.TestCase):
"libclang_rt.asan-.*",
"libROOTSanitizerConfig",
"libjitterentropy", # by libssl on openSUSE
"libsandbox", # Gentoo portage test environment
]

# Verbose mode of the test
Expand Down
3 changes: 3 additions & 0 deletions cmake/modules/RootMacros.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2960,6 +2960,9 @@ function(ROOTTEST_ADD_OLDTEST)
WORKING_DIR ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS roottest-root-io-event
FIXTURES_REQUIRED UtilsLibraryBuild
# The Makefile breaks if these two variables are in the environment by accident:
# If they are unset, root-config --arch --platform is invoked correctly
ENVIRONMENT ARCH=;PLATFORM=
LABELS ${ARG_LABELS} TIMEOUT ${ARG_TIMEOUT})
if(MSVC)
ROOTTEST_TARGETNAME_FROM_FILE(testprefix .)
Expand Down
18 changes: 10 additions & 8 deletions cmake/modules/RootTestDriver.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,15 +89,17 @@ if(ENV)
# value as a single string.
string(REPLACE ";" "\\;" pair "${pair}")

# Split KEY=VALUE into a 2-element CMake list: [KEY;VALUE]
string(REGEX REPLACE "^([^=]+)=(.*)$" "\\1;\\2" pair "${pair}")
# Split KEY=VALUE
string(REGEX REPLACE "^([^=]+)=(.*)$" "\\1" var "${pair}")
string(REGEX REPLACE "^([^=]+)=(.*)$" "\\2" val "${pair}")

list(GET pair 0 var)
list(GET pair 1 val)

# As before, quoting is important here so the semicolons are not
# interpreted as list separators.
set(ENV{${var}} "${val}")
if(val STREQUAL "")
unset(ENV{${var}})
else()
# As before, quoting is important here so the semicolons are not
# interpreted as list separators.
set(ENV{${var}} "${val}")
endif()

if(DBG)
message(STATUS "testdriver[ENV]:${var}==>${val}")
Expand Down
2 changes: 1 addition & 1 deletion roottest/cling/dict/ROOT-9185/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ROOTTEST_ADD_TEST(ROOT9185
EXEC rootcling
EXEC $<TARGET_FILE:rootcling>
OPTS -v2 -f ROOT9185Dict.cxx -s ROOT9185Dict.so -rml ROOT9185Dict.so -rmf ROOT9185Dict.rootmap ROOT9185.h ${CMAKE_CURRENT_SOURCE_DIR}/ROOT9185Linkdef.h
COPY_TO_BUILDDIR ROOT9185.h)
Loading