Skip to content

Commit 215a198

Browse files
committed
[roottest] add dependency for io/evolution/foreign10 test
Make it dependent from reflex dictionary building. On parallel running test it may try auto-loading incomplete library
1 parent 1f849ed commit 215a198

File tree

1 file changed

+22
-20
lines changed

1 file changed

+22
-20
lines changed

roottest/root/io/evolution/CMakeLists.txt

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -121,16 +121,6 @@ ROOTTEST_ADD_TEST(boolUpdate
121121
FIXTURES_REQUIRED root-io-evolution-boolUpdate-fixture)
122122

123123

124-
ROOTTEST_COMPILE_MACRO(cms.cxx
125-
FIXTURES_SETUP root-io-evolution-cms-fixture)
126-
127-
ROOTTEST_ADD_TEST(foreign310
128-
MACRO runforeign310.C
129-
OUTREF foreign310.ref
130-
COPY_TO_BUILDDIR CMS.root
131-
LABELS longtest io
132-
FIXTURES_REQUIRED root-io-evolution-cms-fixture)
133-
134124
ROOTTEST_ADD_TEST(Missing
135125
MACRO runMissing.C
136126
OUTREF Missing.ref
@@ -202,18 +192,30 @@ ROOTTEST_ADD_TEST(ClonesArrayEvo
202192

203193
# there is problem parsing XML file on Windows, therefore reflex dictionary generation fails
204194
if (NOT MSVC OR win_broken_tests)
205-
ROOTTEST_GENERATE_REFLEX_DICTIONARY(libioReadRuleEquivalentCode
206-
ioReadRuleEquivalentCode.h
207-
SELECTION ioReadRuleEquivalentCode_selection.xml
208-
FIXTURES_SETUP root-io-evolution-libioReadRuleEquivalentCode-fixture)
195+
set(_fixture_reflex root-io-evolution-ioReadRuleEquivalentCode-fixture)
196+
ROOTTEST_GENERATE_REFLEX_DICTIONARY(ioReadRuleEquivalentCode
197+
ioReadRuleEquivalentCode.h
198+
SELECTION ioReadRuleEquivalentCode_selection.xml
199+
FIXTURES_SETUP ${_fixture_reflex})
200+
201+
ROOTTEST_ADD_TEST(ioReadRuleEquivalentCode
202+
MACRO execioReadRuleEquivalentCode.C
203+
OUTREF execioReadRuleEquivalentCode.ref
204+
COPY_TO_BUILDDIR ioReadRuleEquivalentCode.root
205+
LABELS longtest io
206+
FIXTURES_REQUIRED ${_fixture_reflex})
207+
endif()
209208

210-
ROOTTEST_ADD_TEST(ioReadRuleEquivalentCode
211-
MACRO execioReadRuleEquivalentCode.C
212-
OUTREF execioReadRuleEquivalentCode.ref
213-
COPY_TO_BUILDDIR ioReadRuleEquivalentCode.root
209+
ROOTTEST_COMPILE_MACRO(cms.cxx
210+
FIXTURES_SETUP root-io-evolution-cms-fixture)
211+
212+
ROOTTEST_ADD_TEST(foreign310
213+
MACRO runforeign310.C
214+
OUTREF foreign310.ref
215+
COPY_TO_BUILDDIR CMS.root
214216
LABELS longtest io
215-
FIXTURES_REQUIRED root-io-evolution-libioReadRuleEquivalentCode-fixture)
216-
endif()
217+
FIXTURES_REQUIRED root-io-evolution-cms-fixture ${_fixture_reflex})
218+
217219

218220
ROOTTEST_ADD_TEST(Skipbaseclass
219221
MACRO execSkipbaseclass.cxx+

0 commit comments

Comments
 (0)