Skip to content

Commit 8d20f37

Browse files
ferdymercuryferdymercury
committed
[test] adapt roottests to new menu functions
1 parent 539fd11 commit 8d20f37

File tree

4 files changed

+26
-14
lines changed

4 files changed

+26
-14
lines changed

‎roottest/root/io/filemerger/CMakeLists.txt

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ROOTTEST_ADD_TEST(execKeyOrder
2-
MACRO execKeyOrder.C
3-
OUTREF execKeyOrder.ref)
2+
MACRO execKeyOrder.C
3+
OUTREF execKeyOrder.ref)
44

55

66
ROOTTEST_ADD_TEST(execCreateAndMerge
@@ -75,7 +75,7 @@ if(ZLIB_CF)
7575
else()
7676
ROOTTEST_ADD_TEST(merged-zlib
7777
PRECMD ${ROOT_hadd_CMD} -f101 mzlibfile1-4.root mzlibfile1-2.root mzlibfile3-4.root
78-
COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testMergedFile.C(\"mzlibfile1-4.root\",101,5014,20)"
78+
COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testMergedFile.C(\"mzlibfile1-4.root\",101,5020,20)"
7979
DEPENDS datagen-hadd-mzlibfile12
8080
DEPENDS datagen-hadd-mzlibfile34)
8181
endif()
@@ -95,7 +95,7 @@ if(${LZ4_VERSION} VERSION_LESS "1.7.5")
9595
elseif(${LZ4_VERSION} VERSION_GREATER_EQUAL "1.7.5")
9696
ROOTTEST_ADD_TEST(merged-lz4
9797
PRECMD ${ROOT_hadd_CMD} -f404 mlz4file1-4.root mlz4file1-2.root mlz4file3-4.root
98-
COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testMergedFile.C(\"mlz4file1-4.root\",404,5395,5)"
98+
COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testMergedFile.C(\"mlz4file1-4.root\",404,5415,5)"
9999
DEPENDS datagen-hadd-mlz4file12
100100
DEPENDS datagen-hadd-mlz4file34)
101101
endif()
@@ -212,7 +212,7 @@ if(${compression_default} STREQUAL "zlib")
212212

213213
ROOTTEST_ADD_TEST(simplek-lz4-compr-level4
214214
PRECMD ${ROOT_hadd_CMD} -fk404 hsimpleK404.root hsimpleK209.root hsimpleK.root hsimple.root hsimple9.root hsimple209.root hsimple409.root hsimple92.root
215-
COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimpleK404.root\",24*25000,404,12047492,30)"
215+
COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimpleK404.root\",24*25000,404,12047502,30)"
216216
DEPENDS roottest-root-io-filemerger-hsimple
217217
DEPENDS simple-lz4-compr-level9
218218
DEPENDS simple-lzma-compr-level9
@@ -222,17 +222,17 @@ if(${compression_default} STREQUAL "zlib")
222222

223223
ROOTTEST_ADD_TEST(simple-lz4-compr-level4
224224
PRECMD ${ROOT_hadd_CMD} -f404 hsimple404.root hsimple.root
225-
COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimple404.root\",25000,404,517262,15)"
225+
COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimple404.root\",25000,404,517292,15)"
226226
DEPENDS roottest-root-io-filemerger-hsimple)
227227

228228
ROOTTEST_ADD_TEST(simple-lz4-compr-level9
229229
PRECMD ${ROOT_hadd_CMD} -f409 hsimple409.root hsimple.root
230-
COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimple409.root\",25000,409,517008,15)"
230+
COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimple409.root\",25000,409,517020,15)"
231231
DEPENDS roottest-root-io-filemerger-hsimple)
232232

233233
ROOTTEST_ADD_TEST(simple-lz4-compr-level1
234234
PRECMD ${ROOT_hadd_CMD} -f401 hsimple401.root hsimple.root
235-
COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimple401.root\",25000,401,519976,5)"
235+
COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimple401.root\",25000,401,520007,5)"
236236
DEPENDS roottest-root-io-filemerger-hsimple)
237237
else()
238238
ROOTTEST_ADD_TEST(simple-default-compr-level9
@@ -325,7 +325,7 @@ if(${compression_default} STREQUAL "zlib")
325325
elseif(${LZ4_VERSION} VERSION_GREATER_EQUAL "1.7.5")
326326
ROOTTEST_ADD_TEST(simplek-lz4-compr-level4
327327
PRECMD ${ROOT_hadd_CMD} -fk404 hsimpleK404.root hsimpleK209.root hsimpleK.root hsimple.root hsimple9.root hsimple209.root hsimple409.root hsimple92.root
328-
COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimpleK404.root\",24*25000,404,12047492,30)"
328+
COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimpleK404.root\",24*25000,404,12047512,30)"
329329
DEPENDS roottest-root-io-filemerger-hsimple
330330
DEPENDS simple-lz4-compr-level9
331331
DEPENDS simple-lzma-compr-level9
@@ -335,22 +335,22 @@ if(${compression_default} STREQUAL "zlib")
335335

336336
ROOTTEST_ADD_TEST(simple-lz4-compr-level4
337337
PRECMD ${ROOT_hadd_CMD} -f404 hsimple404.root hsimple.root
338-
COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimple404.root\",25000,404,517262,15)"
338+
COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimple404.root\",25000,404,517292,15)"
339339
DEPENDS roottest-root-io-filemerger-hsimple)
340340
if(CMAKE_SYSTEM_PROCESSOR MATCHES aarch64)
341341
ROOTTEST_ADD_TEST(simple-lz4-compr-level9
342342
PRECMD ${ROOT_hadd_CMD} -f409 hsimple409.root hsimple.root
343-
COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimple409.root\",25000,409,516975,30)"
343+
COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimple409.root\",25000,409,517004,30)"
344344
DEPENDS roottest-root-io-filemerger-hsimple)
345345
else()
346346
ROOTTEST_ADD_TEST(simple-lz4-compr-level9
347347
PRECMD ${ROOT_hadd_CMD} -f409 hsimple409.root hsimple.root
348-
COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimple409.root\",25000,409,517008,15)"
348+
COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimple409.root\",25000,409,517020,15)"
349349
DEPENDS roottest-root-io-filemerger-hsimple)
350350
endif()
351351
ROOTTEST_ADD_TEST(simple-lz4-compr-level1
352352
PRECMD ${ROOT_hadd_CMD} -f401 hsimple401.root hsimple.root
353-
COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimple401.root\",25000,401,519976,10)"
353+
COMMAND ${ROOT_root_CMD} -q -l -b "${CMAKE_CURRENT_SOURCE_DIR}/testSimpleFile.C(\"hsimple401.root\",25000,401,520007,10)"
354354
DEPENDS roottest-root-io-filemerger-hsimple)
355355
endif()
356356

@@ -368,5 +368,5 @@ endif()
368368

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

‎roottest/root/meta/MemberComments.ref

+4
Original file line numberDiff line numberDiff line change
@@ -588,6 +588,10 @@ OBJ: TList TList Doubly linked list : 0
588588

589589
TH1::Class()->GetMenuItems():
590590
OBJ: TList TList Doubly linked list : 0
591+
OBJ: TMethod AutoZoom *MENU* : 0
592+
void TH1::AutoZoom()
593+
OBJ: TMethod UnZoom *MENU* : 0
594+
void TH1::UnZoom()
591595
OBJ: TMethod DrawPanel *MENU* : 0
592596
void TH1::DrawPanel()
593597
OBJ: TMethod Fit *MENU* : 0

‎roottest/root/meta/MemberComments_win32.ref

+4
Original file line numberDiff line numberDiff line change
@@ -588,6 +588,10 @@ OBJ: TList TList Doubly linked list : 0
588588

589589
TH1::Class()->GetMenuItems():
590590
OBJ: TList TList Doubly linked list : 0
591+
OBJ: TMethod AutoZoom *MENU* : 0
592+
void TH1::AutoZoom()
593+
OBJ: TMethod UnZoom *MENU* : 0
594+
void TH1::UnZoom()
591595
OBJ: TMethod DrawPanel *MENU* : 0
592596
void TH1::DrawPanel()
593597
OBJ: TMethod Fit *MENU* : 0

‎roottest/root/meta/MemberComments_win64.ref

+4
Original file line numberDiff line numberDiff line change
@@ -588,6 +588,10 @@ OBJ: TList TList Doubly linked list : 0
588588

589589
TH1::Class()->GetMenuItems():
590590
OBJ: TList TList Doubly linked list : 0
591+
OBJ: TMethod AutoZoom *MENU* : 0
592+
void TH1::AutoZoom()
593+
OBJ: TMethod UnZoom *MENU* : 0
594+
void TH1::UnZoom()
591595
OBJ: TMethod DrawPanel *MENU* : 0
592596
void TH1::DrawPanel()
593597
OBJ: TMethod Fit *MENU* : 0

0 commit comments

Comments
 (0)