Skip to content

Commit b0c7758

Browse files
committed
[roottest] compile utils.cc centrally to use from different tests
1 parent ec76ecb commit b0c7758

File tree

3 files changed

+7
-10
lines changed

3 files changed

+7
-10
lines changed

roottest/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -303,5 +303,8 @@ set(CMAKE_MACOSX_RPATH TRUE) # use RPATH for MacOSX
303303
include(RoottestCTest)
304304
include(SearchInstalledSoftwareRoottest)
305305

306+
ROOTTEST_COMPILE_MACRO(scripts/utils.cc
307+
FIXTURES_SETUP roottest-scripts-utils-fixture)
308+
306309
message("-- Scanning subdirectories for tests...")
307310
ROOTTEST_ADD_TESTDIRS()

roottest/root/tree/addresses/CMakeLists.txt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,14 +94,11 @@ endif()
9494
ROOTTEST_COMPILE_MACRO(iobug.C
9595
FIXTURES_SETUP root-tree-addresses-iobug-fixture)
9696

97-
ROOTTEST_COMPILE_MACRO(${CMAKE_SOURCE_DIR}/roottest/scripts/utils.cc
98-
FIXTURES_SETUP root-tree-addresses-utils-fixture)
99-
10097
ROOTTEST_ADD_TEST(iobug
10198
MACRO runiobug.C
102-
ROOTEXE_OPTS -e "(void)gSystem->Load(\"utils_cc\")"
99+
ROOTEXE_OPTS -e "(void)gSystem->Load(\"../../../utils_cc\")"
103100
OUTREF iobug.ref
104-
FIXTURES_REQUIRED root-tree-addresses-iobug-fixture root-tree-addresses-utils-fixture)
101+
FIXTURES_REQUIRED root-tree-addresses-iobug-fixture roottest-scripts-utils-fixture)
105102

106103
ROOTTEST_COMPILE_MACRO(userClass.C
107104
FIXTURES_SETUP root-tree-addresses-userClass-fixture)

roottest/root/treedraw/CMakeLists.txt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
1-
ROOTTEST_COMPILE_MACRO(${CMAKE_SOURCE_DIR}/roottest/scripts/utils.cc
2-
FIXTURES_SETUP root-treedraw-utils-fixture)
3-
41
ROOTTEST_ADD_TEST(create
52
MACRO ${CMAKE_SOURCE_DIR}/tutorials/hsimple.C
63
PASSRC 255
74
FIXTURES_SETUP root-treedraw-create-fixture)
85

96
ROOTTEST_ADD_TEST(simple
107
MACRO runsimple.C
11-
ROOTEXE_OPTS -e "(void)gSystem->Load(\"utils_cc\")"
8+
ROOTEXE_OPTS -e "(void)gSystem->Load(\"../../utils_cc\")"
129
COPY_TO_BUILDDIR hsimple.ps.ref
1310
OUTREF simple.ref
14-
FIXTURES_REQUIRED root-treedraw-utils-fixture root-treedraw-create-fixture)
11+
FIXTURES_REQUIRED roottest-scripts-utils-fixture root-treedraw-create-fixture)

0 commit comments

Comments
 (0)