Skip to content

[roottest] improve cmake for root/collection #19571

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.

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 0 additions & 1 deletion roottest/root/collection/.rootrc

This file was deleted.

50 changes: 37 additions & 13 deletions roottest/root/collection/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
42 changes: 21 additions & 21 deletions roottest/root/collection/runTExMap.oref
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

Processing /Users/mato/Development/ROOT/root.git/roottest/root/collection/runTExMap.C...
Processing runTExMap.C...

TExMap Basic Tests Start

Expand Down Expand Up @@ -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

42 changes: 21 additions & 21 deletions roottest/root/collection/runTExMap32.oref
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

Processing /Users/mato/Development/ROOT/root.git/roottest/root/collection/runTExMap.C...
Processing runTExMap.C...

TExMap Basic Tests Start

Expand Down Expand Up @@ -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

Loading