Skip to content
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

[WIP] Adjusting tests because of TRandom3 changes #1063

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

[WIP] Adjusting tests because of TRandom3 changes #1063

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
93f1fb2
Adjusting tests because of TRandom3 changes
kjvbrt Feb 15, 2024
2b037d6
Adjustng expected file size in root-io-filemerger
kjvbrt Feb 15, 2024
d3a26da
Adjusting roottest-root-io-filemerger tests
kjvbrt Feb 16, 2024
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
22 changes: 11 additions & 11 deletions root/io/filemerger/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ if(${compression_default} STREQUAL "zlib")

ROOTTEST_ADD_TEST(simplek-default-compr-deflevel
PRECMD ${ROOT_hadd_CMD} -fk hsimpleK.root hsimple209.root hsimple409.root hsimple.root hsimple9.root hsimple92.root
COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimpleK.root\",6*25000,209,2297616,30)"
COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimpleK.root\",6*25000,209,1916475,30)"
DEPENDS roottest-root-io-filemerger-hsimple
DEPENDS simple-lz4-compr-level9
DEPENDS simple-lzma-compr-level9
Expand All @@ -192,7 +192,7 @@ if(${compression_default} STREQUAL "zlib")

ROOTTEST_ADD_TEST(simplek-lzma-compr-level9
PRECMD ${ROOT_hadd_CMD} -fk209 hsimpleK209.root hsimpleK.root hsimple209.root hsimple409.root hsimple.root hsimple9.root hsimple92.root
COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimpleK209.root\",12*25000,209,4583840,30)"
COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimpleK209.root\",12*25000,209,3822014,30)"
DEPENDS roottest-root-io-filemerger-hsimple
DEPENDS simple-lz4-compr-level9
DEPENDS simple-lzma-compr-level9
Expand All @@ -213,7 +213,7 @@ if(${compression_default} STREQUAL "zlib")
if(${LZ4_VERSION} VERSION_LESS "1.7.5")
ROOTTEST_ADD_TEST(simplek-lz4-compr-level4
PRECMD ${ROOT_hadd_CMD} -fk404 hsimpleK404.root hsimpleK209.root hsimpleK.root hsimple.root hsimple9.root hsimple209.root hsimple409.root hsimple92.root
COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimpleK404.root\",24*25000,404,12047492,30)"
COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimpleK404.root\",24*25000,404,10042617,30)"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is surprising large (looks like a 20% decrease). One should check why that is the case. (Same for two other change on line 195 and 186)

DEPENDS roottest-root-io-filemerger-hsimple
DEPENDS simple-lz4-compr-level9
DEPENDS simple-lzma-compr-level9
Expand Down Expand Up @@ -274,7 +274,7 @@ if(${compression_default} STREQUAL "zlib")

ROOTTEST_ADD_TEST(simple-zlib-compr-level6
PRECMD ${ROOT_hadd_CMD} -f106 hsimple106.root hsimple.root
COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimple106.root\",25000,106,431303,25)"
COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimple106.root\",25000,106,431276,25)"
DEPENDS roottest-root-io-filemerger-hsimple)

ROOTTEST_ADD_TEST(simple-zlib-compr-level9
Expand All @@ -296,19 +296,19 @@ if(${compression_default} STREQUAL "zlib")

ROOTTEST_ADD_TEST(simplex2-default-compr-level9
PRECMD ${ROOT_hadd_CMD} -f9 -a hsimple9x2.root hsimple.root
COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimple9x2.root\",50000,9,850127,30)"
COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimple9x2.root\",50000,9,850084,30)"
POSTCMD ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/hsimple9x2.root ${CMAKE_CURRENT_BINARY_DIR}/hsimple92.root
DEPENDS simple-default-compr-level9-datageneration)

ROOTTEST_ADD_TEST(simplex2-zlib-compr-level9
PRECMD ${ROOT_hadd_CMD} -f109 -a hsimple109x2.root hsimple.root
COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimple109x2.root\",50000,109,850136,30)"
COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimple109x2.root\",50000,109,850094,30)"
POSTCMD ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/hsimple109x2.root ${CMAKE_CURRENT_BINARY_DIR}/hsimple1092.root
DEPENDS simple-zlib-compr-level9-datageneration)

ROOTTEST_ADD_TEST(simplek-default-compr-deflevel
PRECMD ${ROOT_hadd_CMD} -fk hsimpleK.root hsimple209.root hsimple409.root hsimple.root hsimple9.root hsimple92.root
COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimpleK.root\",6*25000,209,2297616,30)"
COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimpleK.root\",6*25000,209,2298020,30)"
DEPENDS roottest-root-io-filemerger-hsimple
DEPENDS simple-lz4-compr-level9
DEPENDS simple-lzma-compr-level9
Expand All @@ -317,7 +317,7 @@ if(${compression_default} STREQUAL "zlib")

ROOTTEST_ADD_TEST(simplek-lzma-compr-level9
PRECMD ${ROOT_hadd_CMD} -fk209 hsimpleK209.root hsimpleK.root hsimple209.root hsimple409.root hsimple.root hsimple9.root hsimple92.root
COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimpleK209.root\",12*25000,209,4583840,30)"
COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimpleK209.root\",12*25000,209,4584264,30)"
DEPENDS roottest-root-io-filemerger-hsimple
DEPENDS filemerger-simple-lz4-compr-level9
DEPENDS filemerger-simple-lzma-compr-level9
Expand Down Expand Up @@ -377,13 +377,13 @@ if(${compression_default} STREQUAL "zlib")
endif()
ROOTTEST_ADD_TEST(simple-lz4-compr-level1
PRECMD ${ROOT_hadd_CMD} -f401 hsimple401.root hsimple.root
COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimple401.root\",25000,401,418952,7)"
COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimple401.root\",25000,401,418941,7)"
DEPENDS roottest-root-io-filemerger-hsimple)
endif()

ROOTTEST_ADD_TEST(simplef-default-compr-level9
PRECMD ${ROOT_hadd_CMD} -ff hsimpleF.root hsimple9.root hsimple209.root hsimple409.root hsimpleK404.root hsimple.root hsimple92.root
COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimpleF.root\",30*25000,9,12581462,30)"
COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimpleF.root\",30*25000,9,12581291,30)"
DEPENDS roottest-root-io-filemerger-hsimple
DEPENDS simple-lz4-compr-level9
DEPENDS simple-lzma-compr-level9
Expand All @@ -395,5 +395,5 @@ endif()

ROOTTEST_ADD_TEST(simple-lzma-compr-level9
PRECMD ${ROOT_hadd_CMD} -f209 hsimple209.root hsimple.root
COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimple209.root\",25000,209,392709,17)"
COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimple209.root\",25000,209,392897,17)"
DEPENDS roottest-root-io-filemerger-hsimple)