Skip to content

Commit a27c97f

Browse files
committed
[roottest] use fixture in root/meta/tclass/regression
On the Windows one should compile macro before running it, for simplicity does it on all platforms. Change test names to avoid collision in log files Remove unused files
1 parent f1d759d commit a27c97f

File tree

3 files changed

+9
-82
lines changed

3 files changed

+9
-82
lines changed

roottest/root/meta/tclass/regression/.rootrc

Lines changed: 0 additions & 1 deletion
This file was deleted.

roottest/root/meta/tclass/regression/CMakeLists.txt

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,26 @@ ROOTTEST_ADD_TEST(execNormalizationInf
66
MACRO execNormalizationInf.C
77
OUTREF execNormalizationInf.ref)
88

9-
if(ROOT_pyroot_FOUND)
9+
if(pyroot)
1010
ROOTTEST_ADD_TEST(execNormalizationInfPy
1111
MACRO execNormalizationInf.py
1212
OUTREF execNormalizationInf.py.ref
1313
ENVIRONMENT CLING_STANDARD_PCH=none
1414
CPPYY_BACKEND_LIBRARY=${CMAKE_BINARY_DIR}/lib/libcppyy_backend.so)
1515
endif()
1616

17-
ROOTTEST_ADD_TEST(execROOT_6038
17+
ROOTTEST_ADD_TEST(6038
1818
MACRO execROOT_6038.C
1919
OUTREF execROOT_6038.ref)
2020

21-
ROOTTEST_ADD_TEST(execROOT_6019
21+
ROOTTEST_ADD_TEST(6019
2222
MACRO execROOT_6019.C
2323
OUTREF execROOT_6019.ref)
2424

25-
if(MSVC)
26-
# needed on Windows to prevent having to run the test twice
27-
# the first time being always failing and successful the second time
28-
ROOTTEST_COMPILE_MACRO(execROOT_6277.cxx)
29-
endif()
30-
ROOTTEST_ADD_TEST(execROOT_6277
25+
ROOTTEST_COMPILE_MACRO(execROOT_6277.cxx
26+
FIXTURES_SETUP root-meta-tclass-regression-6277-fixture)
27+
28+
ROOTTEST_ADD_TEST(6277
3129
MACRO execROOT_6277.cxx+
32-
OUTREF execROOT_6277.ref)
30+
OUTREF execROOT_6277.ref
31+
FIXTURES_REQUIRED root-meta-tclass-regression-6277-fixture)

roottest/root/meta/tclass/regression/Makefile

Lines changed: 0 additions & 71 deletions
This file was deleted.

0 commit comments

Comments
 (0)