From 8302d18e36f107a760df84ac20071fee5749acf9 Mon Sep 17 00:00:00 2001 From: Sergey Linev Date: Thu, 7 Aug 2025 14:59:59 +0200 Subject: [PATCH] [roottest] improve cmake for `root/collection` Use explicit list of test - one test was not present in automatic list Copy ROOT file only for specific test --- roottest/root/collection/.rootrc | 1 - roottest/root/collection/CMakeLists.txt | 50 +++++++++++++++++------ roottest/root/collection/runTExMap.oref | 42 +++++++++---------- roottest/root/collection/runTExMap32.oref | 42 +++++++++---------- 4 files changed, 79 insertions(+), 56 deletions(-) delete mode 100644 roottest/root/collection/.rootrc diff --git a/roottest/root/collection/.rootrc b/roottest/root/collection/.rootrc deleted file mode 100644 index 6ebe75fd4ec5a..0000000000000 --- a/roottest/root/collection/.rootrc +++ /dev/null @@ -1 +0,0 @@ -Rint.History: .root_hist diff --git a/roottest/root/collection/CMakeLists.txt b/roottest/root/collection/CMakeLists.txt index 813543583e60e..814b91bbd7e73 100644 --- a/roottest/root/collection/CMakeLists.txt +++ b/roottest/root/collection/CMakeLists.txt @@ -1,26 +1,50 @@ -#---Copy from source to binary some of the files -configure_file(HistArray.root . COPYONLY) +ROOTTEST_ADD_TEST(ROOT-7249 + MACRO AccidentalOwnership.C) -ROOTTEST_ADD_AUTOMACROS(EXCLUDE execMissing runTExMap runDeleteWarning) -ROOTTEST_ADD_TEST(execMissing +ROOTTEST_ADD_TEST(HistArray + MACRO execHistArray.cxx+ + COPY_TO_BUILDDIR HistArray.root + OUTREF execHistArray.ref) + +ROOTTEST_ADD_TEST(RangeExpression + MACRO execRangeExpression.C + OUTREF execRangeExpression.ref) + +ROOTTEST_ADD_TEST(TClonesArrayAbsorb + MACRO execTClonesArrayAbsorb.C + OUTREF execTClonesArrayAbsorb.ref) + +ROOTTEST_ADD_TEST(CATTreeClear + MACRO runCATTreeClear.C + OUTREF CATTreeClear.ref) + +ROOTTEST_ADD_TEST(TMap + MACRO runTMap.C + OUTREF TMap.ref) + +ROOTTEST_ADD_TEST(tbits + MACRO runtbits.C + OUTREF tbits.ref) + +ROOTTEST_ADD_TEST(Missing MACRO execMissing.C OUTREF execMissing.oref ERRREF execMissing.eref ) if (32BIT OR MSVC) -ROOTTEST_ADD_TEST(runTExMap - MACRO runTExMap.C - OUTREF runTExMap32.oref - ERRREF runTExMap32.eref ) + ROOTTEST_ADD_TEST(TExMap + MACRO runTExMap.C + OUTREF runTExMap32.oref + ERRREF runTExMap32.eref ) else() -ROOTTEST_ADD_TEST(runTExMap - MACRO runTExMap.C - OUTREF runTExMap.oref - ERRREF runTExMap.eref ) + ROOTTEST_ADD_TEST(TExMap + MACRO runTExMap.C + OUTREF runTExMap.oref + ERRREF runTExMap.eref ) endif() -ROOTTEST_ADD_TEST(runDeleteWarning +ROOTTEST_ADD_TEST(DeleteWarning MACRO runDeleteWarning.C OUTCNVCMD sed -e s:0x[0-9a-fA-F]*:0xRemoved:g OUTREF DeleteWarning.ref) diff --git a/roottest/root/collection/runTExMap.oref b/roottest/root/collection/runTExMap.oref index 5f60c76a4b498..bbf4509634009 100644 --- a/roottest/root/collection/runTExMap.oref +++ b/roottest/root/collection/runTExMap.oref @@ -1,5 +1,5 @@ -Processing /Users/mato/Development/ROOT/root.git/roottest/root/collection/runTExMap.C... +Processing runTExMap.C... TExMap Basic Tests Start @@ -241,63 +241,63 @@ TestRange(hash_div4) TestDoubleAdd(hash_identity, -9223372036854775808) -(Expect Error) +(Expect Error) TestDoubleAdd(hash_min, -9223372036854775808) -(Expect Error) +(Expect Error) TestDoubleAdd(hash_max, -9223372036854775808) -(Expect Error) +(Expect Error) TestDoubleAdd(hash_div4, -9223372036854775808) -(Expect Error) +(Expect Error) TestDoubleAdd(hash_identity, -1) -(Expect Error) +(Expect Error) TestDoubleAdd(hash_min, -1) -(Expect Error) +(Expect Error) TestDoubleAdd(hash_max, -1) -(Expect Error) +(Expect Error) TestDoubleAdd(hash_div4, -1) -(Expect Error) +(Expect Error) TestDoubleAdd(hash_identity, 0) -(Expect Error) +(Expect Error) TestDoubleAdd(hash_min, 0) -(Expect Error) +(Expect Error) TestDoubleAdd(hash_max, 0) -(Expect Error) +(Expect Error) TestDoubleAdd(hash_div4, 0) -(Expect Error) +(Expect Error) TestDoubleAdd(hash_identity, 1) -(Expect Error) +(Expect Error) TestDoubleAdd(hash_min, 1) -(Expect Error) +(Expect Error) TestDoubleAdd(hash_max, 1) -(Expect Error) +(Expect Error) TestDoubleAdd(hash_div4, 1) -(Expect Error) +(Expect Error) TestDoubleAdd(hash_identity, 9223372036854775807) -(Expect Error) +(Expect Error) TestDoubleAdd(hash_min, 9223372036854775807) -(Expect Error) +(Expect Error) TestDoubleAdd(hash_max, 9223372036854775807) -(Expect Error) +(Expect Error) TestDoubleAdd(hash_div4, 9223372036854775807) -(Expect Error) +(Expect Error) TExMap Basic Tests End diff --git a/roottest/root/collection/runTExMap32.oref b/roottest/root/collection/runTExMap32.oref index d98e15b0e63ca..0a4587d427cff 100644 --- a/roottest/root/collection/runTExMap32.oref +++ b/roottest/root/collection/runTExMap32.oref @@ -1,5 +1,5 @@ -Processing /Users/mato/Development/ROOT/root.git/roottest/root/collection/runTExMap.C... +Processing runTExMap.C... TExMap Basic Tests Start @@ -241,63 +241,63 @@ TestRange(hash_div4) TestDoubleAdd(hash_identity, -2147483648) -(Expect Error) +(Expect Error) TestDoubleAdd(hash_min, -2147483648) -(Expect Error) +(Expect Error) TestDoubleAdd(hash_max, -2147483648) -(Expect Error) +(Expect Error) TestDoubleAdd(hash_div4, -2147483648) -(Expect Error) +(Expect Error) TestDoubleAdd(hash_identity, -1) -(Expect Error) +(Expect Error) TestDoubleAdd(hash_min, -1) -(Expect Error) +(Expect Error) TestDoubleAdd(hash_max, -1) -(Expect Error) +(Expect Error) TestDoubleAdd(hash_div4, -1) -(Expect Error) +(Expect Error) TestDoubleAdd(hash_identity, 0) -(Expect Error) +(Expect Error) TestDoubleAdd(hash_min, 0) -(Expect Error) +(Expect Error) TestDoubleAdd(hash_max, 0) -(Expect Error) +(Expect Error) TestDoubleAdd(hash_div4, 0) -(Expect Error) +(Expect Error) TestDoubleAdd(hash_identity, 1) -(Expect Error) +(Expect Error) TestDoubleAdd(hash_min, 1) -(Expect Error) +(Expect Error) TestDoubleAdd(hash_max, 1) -(Expect Error) +(Expect Error) TestDoubleAdd(hash_div4, 1) -(Expect Error) +(Expect Error) TestDoubleAdd(hash_identity, 2147483647) -(Expect Error) +(Expect Error) TestDoubleAdd(hash_min, 2147483647) -(Expect Error) +(Expect Error) TestDoubleAdd(hash_max, 2147483647) -(Expect Error) +(Expect Error) TestDoubleAdd(hash_div4, 2147483647) -(Expect Error) +(Expect Error) TExMap Basic Tests End