Skip to content

Commit 944b3f2

Browse files
bellenotbellenot
committed
[win64] disable failing test and add a reference file
Disable the failing `roottest-python-cling-class` test and add a reference file for the `roottest-root-tree-fastcloning-execCheckClusterRange` test on Windows 64
1 parent 090710c commit 944b3f2

File tree

3 files changed

+247
-6
lines changed

3 files changed

+247
-6
lines changed

‎python/cling/CMakeLists.txt‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,14 @@ if(ROOT_pyroot_FOUND)
1414
# TPython::LoadMacro and TPython::Import are broken in the new Cppyy
1515
# https://bitbucket.org/wlav/cppyy/issues/65
1616
# For now, we rely on our own implementation of TPython
17-
ROOTTEST_ADD_TEST(class MACRO
18-
runPyClassTest.C
19-
WORKING_DIR ${CMAKE_CURRENT_SOURCE_DIR}
20-
OUTREF PyClassTest.ref
21-
ENVIRONMENT CLING_STANDARD_PCH=none
22-
CPPYY_BACKEND_LIBRARY=${CMAKE_BINARY_DIR}/lib/libcppyy_backend${PYTHON_UNDER_VERSION_STRING_Development_Main}.so)
17+
if(NOT MSVC OR "${CMAKE_GENERATOR_PLATFORM}" MATCHES "Win32" OR win_broken_tests)
18+
ROOTTEST_ADD_TEST(class MACRO
19+
runPyClassTest.C
20+
WORKING_DIR ${CMAKE_CURRENT_SOURCE_DIR}
21+
OUTREF PyClassTest.ref
22+
ENVIRONMENT CLING_STANDARD_PCH=none
23+
CPPYY_BACKEND_LIBRARY=${CMAKE_BINARY_DIR}/lib/libcppyy_backend${PYTHON_UNDER_VERSION_STRING_Development_Main}.so)
24+
endif()
2325

2426
ROOTTEST_ADD_TEST(cling
2527
MACRO PyROOT_clingtests.py

‎root/tree/fastcloning/CMakeLists.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ if(${compression_default} STREQUAL "zlib")
1010
ROOTTEST_ADD_TEST(execCheckClusterRange
1111
MACRO execCheckClusterRange.C
1212
OUTREF references/execCheckClusterRange_builtinzlib.ref)
13+
elseif(MSVC)
14+
ROOTTEST_ADD_TEST(execCheckClusterRange
15+
MACRO execCheckClusterRange.C
16+
OUTREF references/execCheckClusterRange_zlib_win64.ref)
1317
else()
1418
ROOTTEST_ADD_TEST(execCheckClusterRange
1519
MACRO execCheckClusterRange.C

‎root/tree/fastcloning/references/execCheckClusterRange_zlib_win64.ref‎

Lines changed: 235 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,235 @@
1+
2+
Processing /Users/pcanal/root_working/roottest/root/tree/fastcloning/execCheckClusterRange.C...
3+
Cluster # 1 starts at 0 and ends at 49
4+
Cluster # 2 starts at 50 and ends at 99
5+
Cluster # 3 starts at 100 and ends at 149
6+
Cluster # 4 starts at 150 and ends at 199
7+
Cluster # 5 starts at 200 and ends at 249
8+
Cluster # 6 starts at 250 and ends at 299
9+
Cluster # 7 starts at 300 and ends at 329
10+
Cluster # 8 starts at 330 and ends at 359
11+
Cluster # 9 starts at 360 and ends at 389
12+
Cluster #10 starts at 390 and ends at 419
13+
Cluster #11 starts at 420 and ends at 449
14+
Cluster #12 starts at 450 and ends at 479
15+
Cluster #13 starts at 480 and ends at 509
16+
Cluster #14 starts at 510 and ends at 539
17+
Cluster #15 starts at 540 and ends at 569
18+
Cluster #16 starts at 570 and ends at 599
19+
******************************************************************************
20+
*Tree :t1 : *
21+
*Entries : 600 : Total = 12810 bytes File Size = 12810 *
22+
* : : Tree compression factor = 1.00 *
23+
******************************************************************************
24+
Cluster Range # Entry Start Last Entry Size Number of clusters
25+
0 0 299 50 6
26+
1 300 599 30 10
27+
Total number of clusters: 16
28+
Cluster # 1 starts at 0 and ends at 49
29+
Cluster # 2 starts at 50 and ends at 99
30+
Cluster # 3 starts at 100 and ends at 149
31+
Cluster # 4 starts at 150 and ends at 199
32+
Cluster # 5 starts at 200 and ends at 249
33+
Cluster # 6 starts at 250 and ends at 299
34+
Cluster # 7 starts at 300 and ends at 329
35+
Cluster # 8 starts at 330 and ends at 359
36+
Cluster # 9 starts at 360 and ends at 389
37+
Cluster #10 starts at 390 and ends at 419
38+
Cluster #11 starts at 420 and ends at 449
39+
Cluster #12 starts at 450 and ends at 479
40+
Cluster #13 starts at 480 and ends at 509
41+
Cluster #14 starts at 510 and ends at 539
42+
Cluster #15 starts at 540 and ends at 569
43+
Cluster #16 starts at 570 and ends at 599
44+
Cluster #17 starts at 600 and ends at 649
45+
Cluster #18 starts at 650 and ends at 699
46+
Cluster #19 starts at 700 and ends at 749
47+
Cluster #20 starts at 750 and ends at 799
48+
Cluster #21 starts at 800 and ends at 849
49+
Cluster #22 starts at 850 and ends at 899
50+
Cluster #23 starts at 900 and ends at 949
51+
Cluster #24 starts at 950 and ends at 999
52+
Cluster #25 starts at 1000 and ends at 1049
53+
Cluster #26 starts at 1050 and ends at 1099
54+
Cluster #27 starts at 1100 and ends at 1149
55+
Cluster #28 starts at 1150 and ends at 1199
56+
Cluster #29 starts at 1200 and ends at 1229
57+
Cluster #30 starts at 1230 and ends at 1259
58+
Cluster #31 starts at 1260 and ends at 1289
59+
Cluster #32 starts at 1290 and ends at 1319
60+
Cluster #33 starts at 1320 and ends at 1349
61+
Cluster #34 starts at 1350 and ends at 1379
62+
Cluster #35 starts at 1380 and ends at 1409
63+
Cluster #36 starts at 1410 and ends at 1439
64+
Cluster #37 starts at 1440 and ends at 1469
65+
Cluster #38 starts at 1470 and ends at 1499
66+
******************************************************************************
67+
*Tree :t1 : *
68+
*Entries : 1500 : Total = 29664 bytes File Size = 16413 *
69+
* : : Tree compression factor = 1.66 *
70+
******************************************************************************
71+
Cluster Range # Entry Start Last Entry Size Number of clusters
72+
0 0 299 50 6
73+
1 300 599 30 10
74+
2 600 899 50 6
75+
3 900 1199 50 6
76+
4 1200 1499 30 10
77+
Total number of clusters: 38
78+
******************************************************************************
79+
*Tree :t2 : *
80+
*Entries : 300 : Total = 2732 bytes File Size = 2732 *
81+
* : : Tree compression factor = 1.00 *
82+
******************************************************************************
83+
Cluster Range # Entry Start Last Entry Size Number of clusters
84+
0 0 299 30 10
85+
Total number of clusters: 10
86+
******************************************************************************
87+
*Tree :t1 : *
88+
*Entries : 1800 : Total = 29346 bytes File Size = 18283 *
89+
* : : Tree compression factor = 1.59 *
90+
******************************************************************************
91+
*Br 0 :v1 : v1/I *
92+
*Entries : 1800 : Total Size= 11865 bytes File Size = 10416 *
93+
*Baskets : 48 : Basket Size= 512 bytes Compression= 1.00 *
94+
*............................................................................*
95+
Cluster # 1 starts at 0 and ends at 49
96+
Cluster # 2 starts at 50 and ends at 99
97+
Cluster # 3 starts at 100 and ends at 149
98+
Cluster # 4 starts at 150 and ends at 199
99+
Cluster # 5 starts at 200 and ends at 249
100+
Cluster # 6 starts at 250 and ends at 299
101+
Cluster # 7 starts at 300 and ends at 329
102+
Cluster # 8 starts at 330 and ends at 359
103+
Cluster # 9 starts at 360 and ends at 389
104+
Cluster #10 starts at 390 and ends at 419
105+
Cluster #11 starts at 420 and ends at 449
106+
Cluster #12 starts at 450 and ends at 479
107+
Cluster #13 starts at 480 and ends at 509
108+
Cluster #14 starts at 510 and ends at 539
109+
Cluster #15 starts at 540 and ends at 569
110+
Cluster #16 starts at 570 and ends at 599
111+
Cluster #17 starts at 600 and ends at 649
112+
Cluster #18 starts at 650 and ends at 699
113+
Cluster #19 starts at 700 and ends at 749
114+
Cluster #20 starts at 750 and ends at 799
115+
Cluster #21 starts at 800 and ends at 849
116+
Cluster #22 starts at 850 and ends at 899
117+
Cluster #23 starts at 900 and ends at 949
118+
Cluster #24 starts at 950 and ends at 999
119+
Cluster #25 starts at 1000 and ends at 1049
120+
Cluster #26 starts at 1050 and ends at 1099
121+
Cluster #27 starts at 1100 and ends at 1149
122+
Cluster #28 starts at 1150 and ends at 1199
123+
Cluster #29 starts at 1200 and ends at 1229
124+
Cluster #30 starts at 1230 and ends at 1259
125+
Cluster #31 starts at 1260 and ends at 1289
126+
Cluster #32 starts at 1290 and ends at 1319
127+
Cluster #33 starts at 1320 and ends at 1349
128+
Cluster #34 starts at 1350 and ends at 1379
129+
Cluster #35 starts at 1380 and ends at 1409
130+
Cluster #36 starts at 1410 and ends at 1439
131+
Cluster #37 starts at 1440 and ends at 1469
132+
Cluster #38 starts at 1470 and ends at 1499
133+
Cluster #39 starts at 1500 and ends at 1529
134+
Cluster #40 starts at 1530 and ends at 1559
135+
Cluster #41 starts at 1560 and ends at 1589
136+
Cluster #42 starts at 1590 and ends at 1619
137+
Cluster #43 starts at 1620 and ends at 1649
138+
Cluster #44 starts at 1650 and ends at 1679
139+
Cluster #45 starts at 1680 and ends at 1709
140+
Cluster #46 starts at 1710 and ends at 1739
141+
Cluster #47 starts at 1740 and ends at 1769
142+
Cluster #48 starts at 1770 and ends at 1799
143+
******************************************************************************
144+
*Tree :t1 : *
145+
*Entries : 1800 : Total = 29346 bytes File Size = 17990 *
146+
* : : Tree compression factor = 1.59 *
147+
******************************************************************************
148+
Cluster Range # Entry Start Last Entry Size Number of clusters
149+
0 0 299 50 6
150+
1 300 599 30 10
151+
2 600 899 50 6
152+
3 900 1199 50 6
153+
4 1200 1799 30 20
154+
Total number of clusters: 48
155+
Cluster # 1 starts at 0 and ends at 49
156+
Cluster # 2 starts at 50 and ends at 99
157+
Cluster # 3 starts at 100 and ends at 149
158+
Cluster # 4 starts at 150 and ends at 199
159+
Cluster # 5 starts at 200 and ends at 249
160+
Cluster # 6 starts at 250 and ends at 299
161+
Cluster # 7 starts at 300 and ends at 329
162+
Cluster # 8 starts at 330 and ends at 359
163+
Cluster # 9 starts at 360 and ends at 389
164+
Cluster #10 starts at 390 and ends at 419
165+
Cluster #11 starts at 420 and ends at 449
166+
Cluster #12 starts at 450 and ends at 479
167+
Cluster #13 starts at 480 and ends at 509
168+
Cluster #14 starts at 510 and ends at 539
169+
Cluster #15 starts at 540 and ends at 569
170+
Cluster #16 starts at 570 and ends at 599
171+
Cluster #17 starts at 600 and ends at 649
172+
Cluster #18 starts at 650 and ends at 699
173+
Cluster #19 starts at 700 and ends at 749
174+
Cluster #20 starts at 750 and ends at 799
175+
Cluster #21 starts at 800 and ends at 849
176+
Cluster #22 starts at 850 and ends at 899
177+
Cluster #23 starts at 900 and ends at 949
178+
Cluster #24 starts at 950 and ends at 999
179+
Cluster #25 starts at 1000 and ends at 1049
180+
Cluster #26 starts at 1050 and ends at 1099
181+
Cluster #27 starts at 1100 and ends at 1149
182+
Cluster #28 starts at 1150 and ends at 1199
183+
Cluster #29 starts at 1200 and ends at 1229
184+
Cluster #30 starts at 1230 and ends at 1259
185+
Cluster #31 starts at 1260 and ends at 1289
186+
Cluster #32 starts at 1290 and ends at 1319
187+
Cluster #33 starts at 1320 and ends at 1349
188+
Cluster #34 starts at 1350 and ends at 1379
189+
Cluster #35 starts at 1380 and ends at 1409
190+
Cluster #36 starts at 1410 and ends at 1439
191+
Cluster #37 starts at 1440 and ends at 1469
192+
Cluster #38 starts at 1470 and ends at 1499
193+
Cluster #39 starts at 1500 and ends at 1529
194+
Cluster #40 starts at 1530 and ends at 1559
195+
Cluster #41 starts at 1560 and ends at 1589
196+
Cluster #42 starts at 1590 and ends at 1619
197+
Cluster #43 starts at 1620 and ends at 1649
198+
Cluster #44 starts at 1650 and ends at 1679
199+
Cluster #45 starts at 1680 and ends at 1709
200+
Cluster #46 starts at 1710 and ends at 1739
201+
Cluster #47 starts at 1740 and ends at 1769
202+
Cluster #48 starts at 1770 and ends at 1799
203+
Cluster #49 starts at 1800 and ends at 1829
204+
Cluster #50 starts at 1830 and ends at 1859
205+
Cluster #51 starts at 1860 and ends at 1889
206+
Cluster #52 starts at 1890 and ends at 1919
207+
Cluster #53 starts at 1920 and ends at 1949
208+
Cluster #54 starts at 1950 and ends at 1979
209+
Cluster #55 starts at 1980 and ends at 2009
210+
Cluster #56 starts at 2010 and ends at 2039
211+
Cluster #57 starts at 2040 and ends at 2069
212+
Cluster #58 starts at 2070 and ends at 2099
213+
Cluster #59 starts at 2100 and ends at 2129
214+
Cluster #60 starts at 2130 and ends at 2159
215+
Cluster #61 starts at 2160 and ends at 2189
216+
Cluster #62 starts at 2190 and ends at 2219
217+
Cluster #63 starts at 2220 and ends at 2249
218+
Cluster #64 starts at 2250 and ends at 2279
219+
Cluster #65 starts at 2280 and ends at 2309
220+
Cluster #66 starts at 2310 and ends at 2339
221+
Cluster #67 starts at 2340 and ends at 2369
222+
Cluster #68 starts at 2370 and ends at 2399
223+
******************************************************************************
224+
*Tree :t1 : *
225+
*Entries : 2400 : Total = 33566 bytes File Size = 20851 *
226+
* : : Tree compression factor = 1.56 *
227+
******************************************************************************
228+
Cluster Range # Entry Start Last Entry Size Number of clusters
229+
0 0 299 50 6
230+
1 300 599 30 10
231+
2 600 899 50 6
232+
3 900 1199 50 6
233+
4 1200 2399 30 40
234+
Total number of clusters: 68
235+
(int) 0

0 commit comments

Comments
 (0)