Skip to content

Commit d2fd1fb

Browse files
committed
[roottest] fix root/tree/addresses/suetest
Link sueloader_C when compiling ConfigRecord.cxx Should also solved problem on Windows
1 parent 4e09bb1 commit d2fd1fb

File tree

1 file changed

+27
-30
lines changed

1 file changed

+27
-30
lines changed

roottest/root/tree/addresses/CMakeLists.txt

Lines changed: 27 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -143,38 +143,35 @@ ROOTTEST_ADD_TEST(ursula
143143
COPY_TO_BUILDDIR cmsursula.root
144144
OUTREF ursula.ref)
145145

146-
#disable on Windows while there are problem to compile ConfigRecord.cxx without building dictionary
147-
#for some classes
148-
if(NOT MSVC OR win_broken_tests)
149-
ROOTTEST_COMPILE_MACRO(ConfigRecord.cxx
150-
FIXTURES_SETUP root-tree-addresses-ConfigRecord-fixture
151-
FIXTURES_REQUIRED root-tree-addresses-sueloader-fixture)
152-
153-
ROOTTEST_COMPILE_MACRO(sueloader.C
154-
FIXTURES_SETUP root-tree-addresses-sueloader-fixture)
155-
156-
if(ClingWorkAroundMissingDynamicScope)
157-
SET(_sue_opts -e "(void)gROOT->ProcessLine(\".L sueloader.C+\")"
158-
-e "(void)gROOT->ProcessLine(\".L ConfigRecord.cxx+\")")
159-
endif()
160-
161-
ROOTTEST_ADD_TEST(configtest
162-
MACRO suetestwrt.C
163-
ROOTEXE_OPTS ${_sue_opts}
164-
OUTREF configtest.ref
165-
FIXTURES_REQUIRED root-tree-addresses-ConfigRecord-fixture
166-
root-tree-addresses-sueloader-fixture
167-
FIXTURES_SETUP root-tree-addresses-configtest-fixture)
168-
169-
ROOTTEST_ADD_TEST(suetest
170-
MACRO suetestrd.C
171-
ROOTEXE_OPTS ${_sue_opts}
172-
OUTREF suetest.ref
173-
FIXTURES_REQUIRED root-tree-addresses-ConfigRecord-fixture
174-
root-tree-addresses-sueloader-fixture
175-
root-tree-addresses-configtest-fixture)
146+
ROOTTEST_COMPILE_MACRO(sueloader.C
147+
FIXTURES_SETUP root-tree-addresses-sueloader-fixture)
148+
149+
ROOTTEST_COMPILE_MACRO(ConfigRecord.cxx
150+
BUILDLIB sueloader_C
151+
FIXTURES_REQUIRED root-tree-addresses-sueloader-fixture
152+
FIXTURES_SETUP root-tree-addresses-ConfigRecord-fixture)
153+
154+
if(ClingWorkAroundMissingDynamicScope)
155+
SET(_sue_opts -e "(void)gROOT->ProcessLine(\".L sueloader.C+\")"
156+
-e "(void)gROOT->ProcessLine(\".L ConfigRecord.cxx+\")")
176157
endif()
177158

159+
ROOTTEST_ADD_TEST(configtest
160+
MACRO suetestwrt.C
161+
ROOTEXE_OPTS ${_sue_opts}
162+
OUTREF configtest.ref
163+
FIXTURES_REQUIRED root-tree-addresses-ConfigRecord-fixture
164+
root-tree-addresses-sueloader-fixture
165+
FIXTURES_SETUP root-tree-addresses-configtest-fixture)
166+
167+
ROOTTEST_ADD_TEST(suetest
168+
MACRO suetestrd.C
169+
ROOTEXE_OPTS ${_sue_opts}
170+
OUTREF suetest.ref
171+
FIXTURES_REQUIRED root-tree-addresses-ConfigRecord-fixture
172+
root-tree-addresses-sueloader-fixture
173+
root-tree-addresses-configtest-fixture)
174+
178175
ROOTTEST_COMPILE_MACRO(JansEvent.C
179176
FIXTURES_SETUP root-tree-addresses-JansEvent-fixture)
180177

0 commit comments

Comments
 (0)