Skip to content

Fix five tests for Gentoo #24150

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

Draft
hageboeck wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Fix five tests for Gentoo #24150

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
f1187ce
[hadd] Remove colour from help message.
hageboeck Nov 13, 2026
566e453
[roottest/io] Adapt file size to lz4 1.11.1.
hageboeck Nov 13, 2026
89defce
[roottest] Add ROOTIGNOREPREFIX to root.exe tests.
hageboeck Nov 13, 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
8 changes: 6 additions & 2 deletions main/src/hadd-argparse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,12 @@ def get_argparse():
"multiplied by the traditional 1024 (1KiB), 1048576 (1MiB), 1073741824 "
"(1GiB), etc. The prefix can be optionally followed by B whose casing "
"is ignored, eg. 1k, 1K, 1Kb and 1KB are the same. ")
parser = argparse.ArgumentParser(add_help=False, prog='hadd',
description=DESCRIPTION, epilog=EPILOGUE)
try:
parser = argparse.ArgumentParser(
add_help=False, prog="hadd", description=DESCRIPTION, epilog=EPILOGUE, color=False
)
except TypeError:
parser = argparse.ArgumentParser(add_help=False, prog="hadd", description=DESCRIPTION, epilog=EPILOGUE)
parser.add_argument("-a", help="Append to the output", action = 'store_true')
parser.add_argument("-f", help=textwrap.fill(
"Force overwriting of output file"), action = 'store_true')
Expand Down
10 changes: 7 additions & 3 deletions roottest/root/core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,12 @@ ROOTTEST_ADD_TEST(StatusBitsCheck
OUTCNV convert.sh
OUTREF execStatusBitsCheck.ref)

# In the tests below, root might not have been installed yet, so we can't rely on rootsys and etcdir --> ROOTIGNOREPREFIX
add_test(NAME root_exe_exitStatus COMMAND $<TARGET_FILE:root.exe> "-e invalid" "--no_exist")
set_property(TEST root_exe_exitStatus PROPERTY WILL_FAIL True)
set_tests_properties(root_exe_exitStatus PROPERTIES
WILL_FAIL True
ENVIRONMENT ROOTIGNOREPREFIX=1)
add_test(NAME root_exe_errorMessage COMMAND $<TARGET_FILE:root.exe> "-e invalid" "--no_exist")
set_property(TEST root_exe_errorMessage PROPERTY
PASS_REGULAR_EXPRESSION "root: unrecognized option '-e invalid'.*--no_exist.*Try 'root --help'")
set_tests_properties(root_exe_errorMessage PROPERTIES
PASS_REGULAR_EXPRESSION "root: unrecognized option '-e invalid'.*--no_exist.*Try 'root --help'"
ENVIRONMENT ROOTIGNOREPREFIX=1)
2 changes: 1 addition & 1 deletion roottest/root/io/filemerger/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ else()
elseif(${LZ4_VERSION} VERSION_GREATER_EQUAL "1.7.5")
ROOTTEST_ADD_TEST(simple-lz4-compr-level1
MACRO testSimpleFile.C
MACROARG "\"hsimple401.root\",25000,401,519976,10"
MACROARG "\"hsimple401.root\",25000,401,519976,200"
FIXTURES_REQUIRED root-io-filemerger-hsimple401-fixture)
endif()
endif()
Expand Down
Loading