@@ -58,40 +58,50 @@ ROOTTEST_ADD_TEST(embread
5858 FIXTURES_REQUIRED root-tree -addresses-Embedded_load-fixture
5959 root-tree -addresses-embwrite-fixture)
6060
61- ROOTTEST_COMPILE_MACRO(relations_load.C
62- FIXTURES_SETUP root-tree -addresses-relations_load-fixture)
63-
64- ROOTTEST_COMPILE_MACRO(relations_read.C
65- FIXTURES_SETUP root-tree -addresses-relations_read-fixture)
66-
67- ROOTTEST_COMPILE_MACRO(relations_write.C
68- FIXTURES_SETUP root-tree -addresses-relations_write-fixture)
69-
70- SET (_relations_opts -e "(void)gROOT->ProcessLine(\" .L relations_load.C+\" )"
71- -e "(void)gROOT->ProcessLine(\" .L relations_write.C+\" )"
72- -e "(void)gROOT->ProcessLine(\" .L relations_read.C+\" )" )
73-
74- ROOTTEST_ADD_TEST(relations
75- MACRO relationsRun.C
76- ROOTEXE_OPTS ${_relations_opts}
77- OUTREF relationsTest.ref
78- OUTCNVCMD sed -e "s|File Size =.*\\ *||g"
79- FIXTURES_REQUIRED root-tree -addresses-relations_load-fixture
80- root-tree -addresses-relations_read-fixture
81- root-tree -addresses-relations_write-fixture)
61+ # disable on Windows because relations_write.C compilation problem
62+ # in any case test cannot be run on Windows because of sed usage
63+ if (NOT MSVC OR win_broken_tests)
64+ ROOTTEST_COMPILE_MACRO(relations_load.C
65+ FIXTURES_SETUP root-tree -addresses-relations_load-fixture)
66+
67+ ROOTTEST_COMPILE_MACRO(relations_read.C
68+ FIXTURES_SETUP root-tree -addresses-relations_read-fixture)
69+
70+ ROOTTEST_COMPILE_MACRO(relations_write.C
71+ FIXTURES_SETUP root-tree -addresses-relations_write-fixture)
72+
73+ SET (_relations_opts -e "(void)gROOT->ProcessLine(\" .L relations_load.C+\" )"
74+ -e "(void)gROOT->ProcessLine(\" .L relations_write.C+\" )"
75+ -e "(void)gROOT->ProcessLine(\" .L relations_read.C+\" )" )
76+
77+ ROOTTEST_ADD_TEST(relations
78+ MACRO relationsRun.C
79+ ROOTEXE_OPTS ${_relations_opts}
80+ OUTREF relationsTest.ref
81+ OUTCNVCMD sed -e "s|File Size =.*\\ *||g"
82+ FIXTURES_REQUIRED root-tree -addresses-relations_load-fixture
83+ root-tree -addresses-relations_read-fixture
84+ root-tree -addresses-relations_write-fixture)
85+ endif ()
8286
83- ROOTTEST_ADD_TEST(merging
84- MACRO runmerging.C
85- OUTREF merging.ref)
87+ # disable on Windows because of problem with running same macro twice
88+ if (NOT MSVC OR win_broken_tests)
89+ ROOTTEST_ADD_TEST(merging
90+ MACRO runmerging.C
91+ OUTREF merging.ref)
92+ endif ()
8693
8794ROOTTEST_COMPILE_MACRO(iobug.C
8895 FIXTURES_SETUP root-tree -addresses-iobug-fixture)
8996
97+ ROOTTEST_COMPILE_MACRO(${CMAKE_SOURCE_DIR} /roottest/scripts/utils.cc
98+ FIXTURES_SETUP root-tree -addresses-utils-fixture)
99+
90100ROOTTEST_ADD_TEST(iobug
91101 MACRO runiobug.C
92- ROOTEXE_OPTS -e "(void)gROOT->ProcessLine (\" .L ${CMAKE_SOURCE_DIR} /roottest/scripts/utils.cc+ \" )"
102+ ROOTEXE_OPTS -e "(void)gSystem->Load (\" utils_cc \" )"
93103 OUTREF iobug.ref
94- FIXTURES_REQUIRED root-tree -addresses-iobug-fixture)
104+ FIXTURES_REQUIRED root-tree -addresses-iobug-fixture root- tree -addresses-utils-fixture )
95105
96106ROOTTEST_COMPILE_MACRO(userClass.C
97107 FIXTURES_SETUP root-tree -addresses-userClass-fixture)
@@ -136,33 +146,37 @@ ROOTTEST_ADD_TEST(ursula
136146 COPY_TO_BUILDDIR cmsursula.root
137147 OUTREF ursula.ref)
138148
139- ROOTTEST_COMPILE_MACRO(ConfigRecord.cxx
140- FIXTURES_SETUP root-tree -addresses-ConfigRecord-fixture)
141-
142- ROOTTEST_COMPILE_MACRO(sueloader.C
143- FIXTURES_SETUP root-tree -addresses-sueloader-fixture)
144-
145- if (ClingWorkAroundMissingDynamicScope)
146- SET (_sue_opts -e "(void)gROOT->ProcessLine(\" .L sueloader.C+\" )"
147- -e "(void)gROOT->ProcessLine(\" .L ConfigRecord.cxx+\" )" )
149+ #disable on Windows while there are problem to compile ConfigRecord.cxx without building dictionary
150+ #for some classes
151+ if (NOT MSVC OR win_broken_tests)
152+ ROOTTEST_COMPILE_MACRO(ConfigRecord.cxx
153+ FIXTURES_SETUP root-tree -addresses-ConfigRecord-fixture)
154+
155+ ROOTTEST_COMPILE_MACRO(sueloader.C
156+ FIXTURES_SETUP root-tree -addresses-sueloader-fixture)
157+
158+ if (ClingWorkAroundMissingDynamicScope)
159+ SET (_sue_opts -e "(void)gROOT->ProcessLine(\" .L sueloader.C+\" )"
160+ -e "(void)gROOT->ProcessLine(\" .L ConfigRecord.cxx+\" )" )
161+ endif ()
162+
163+ ROOTTEST_ADD_TEST(configtest
164+ MACRO suetestwrt.C
165+ ROOTEXE_OPTS ${_sue_opts}
166+ OUTREF configtest.ref
167+ FIXTURES_REQUIRED root-tree -addresses-ConfigRecord-fixture
168+ root-tree -addresses-sueloader-fixture
169+ FIXTURES_SETUP root-tree -addresses-configtest-fixture)
170+
171+ ROOTTEST_ADD_TEST(suetest
172+ MACRO suetestrd.C
173+ ROOTEXE_OPTS ${_sue_opts}
174+ OUTREF suetest.ref
175+ FIXTURES_REQUIRED root-tree -addresses-ConfigRecord-fixture
176+ root-tree -addresses-sueloader-fixture
177+ root-tree -addresses-configtest-fixture)
148178endif ()
149179
150- ROOTTEST_ADD_TEST(configtest
151- MACRO suetestwrt.C
152- ROOTEXE_OPTS ${_sue_opts}
153- OUTREF configtest.ref
154- FIXTURES_REQUIRED root-tree -addresses-ConfigRecord-fixture
155- root-tree -addresses-sueloader-fixture
156- FIXTURES_SETUP root-tree -addresses-configtest-fixture)
157-
158- ROOTTEST_ADD_TEST(suetest
159- MACRO suetestrd.C
160- ROOTEXE_OPTS ${_sue_opts}
161- OUTREF suetest.ref
162- FIXTURES_REQUIRED root-tree -addresses-ConfigRecord-fixture
163- root-tree -addresses-sueloader-fixture
164- root-tree -addresses-configtest-fixture)
165-
166180ROOTTEST_COMPILE_MACRO(JansEvent.C
167181 FIXTURES_SETUP root-tree -addresses-JansEvent-fixture)
168182
0 commit comments