Skip to content

Commit 3540eff

Browse files
Vipul-Cariappavgvassilev
authored andcommitted
[test] update tags
fixed by compiler-research/CPyCppyy#65
1 parent f1c1946 commit 3540eff

File tree

6 files changed

+12
-10
lines changed

6 files changed

+12
-10
lines changed

test/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ all : $(dicts)
1818

1919
#cppflags=$(shell llvm-config --cxxflags) -O3 -fPIC -I$(shell python -c 'import sysconfig as sc; print(sc.get_config_var("INCLUDEPY"))') -Wno-register
2020
# FIXME: stltypes.cxx does not compile with clang!
21-
cppflags= -std=c++17 -O3 -fPIC -I$(shell python -c 'import sysconfig as sc; print(sc.get_config_var("INCLUDEPY"))') -Wno-register
21+
cppflags= -std=c++17 -O0 -g -fPIC -I$(shell python -c 'import sysconfig as sc; print(sc.get_config_var("INCLUDEPY"))') -Wno-register
2222

2323
PLATFORM := $(shell uname -s)
2424
ifeq ($(PLATFORM),Darwin)

test/test_datatypes.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ def test01_instance_data_read_access(self):
193193

194194
c.__destruct__()
195195

196-
@mark.xfail
196+
@mark.xfail(condition=not IS_CLANG_REPL, reason="fails with Cling")
197197
def test02_instance_data_write_access(self):
198198
"""Test write access to instance public data and verify values"""
199199

test/test_doc_features.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1093,7 +1093,6 @@ def setup_class(cls):
10931093

10941094
cppyy.gbl.talk_examples
10951095

1096-
@mark.xfail(run=not((IS_MAC_ARM or IS_MAC_X86) and not IS_CLANG_REPL))
10971096
def test_template_instantiation(self):
10981097
"""Run-time template instantiation example"""
10991098

test/test_regression.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@ def test08_typedef_identity(self):
205205
assert not 'vector<const PyABC::S1*>' in dir(PyABC.S2)
206206
assert PyABC.S2.S1_coll is cppyy.gbl.std.vector('const PyABC::S1*')
207207

208+
@mark.xfail(condition=(IS_MAC and not IS_CLANG_REPL), reason="fails on OSX-Cling")
208209
def test09_gil_not_released(self):
209210
"""GIL was released by accident for by-value returns"""
210211

@@ -307,7 +308,6 @@ def test13_char_star_over_char(self):
307308
assert cppyy.gbl.csoc3.call('0') == 'string'
308309
assert cppyy.gbl.csoc3.call('00') == 'string'
309310

310-
@mark.xfail(condition=(not IS_CLANG_REPL) and (IS_MAC_ARM or IS_MAC_X86), reason="Fails on OS X Cling")
311311
def test14_struct_direct_definition(self):
312312
"""Struct defined directly in a scope miseed scope in renormalized name"""
313313

test/test_stltypes.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ def test10_vector_std_distance(self):
455455
assert std.distance(v.begin(), v.end()) == v.size()
456456
assert std.distance[type(v).iterator](v.begin(), v.end()) == v.size()
457457

458-
@mark.xfail
458+
@mark.xfail(condition=(IS_MAC and not IS_CLANG_REPL), reason="fails on OSX-Cling")
459459
def test11_vector_of_pair(self):
460460
"""Use of std::vector<std::pair>"""
461461

@@ -673,7 +673,7 @@ def test18_array_interface(self):
673673
v = np.array(v, dtype=np.intc)
674674
assert ns.func(v) == sum(v)
675675

676-
@mark.xfail(run=not((IS_MAC_ARM or IS_MAC_X86) and not IS_CLANG_REPL))
676+
@mark.xfail(condition=IS_MAC and not IS_CLANG_REPL, run=False, reason="Crashes with OSX-Cling")
677677
def test19_vector_point3d(self):
678678
"""Iteration over a vector of by-value objects"""
679679

@@ -1524,6 +1524,7 @@ def test01_array_of_basic_types(self):
15241524
a[i] = i
15251525
assert a[i] == i
15261526

1527+
@mark.xfail(condition=(IS_MAC and not IS_CLANG_REPL), reason="fails on OSX-Cling")
15271528
def test02_array_of_pods(self):
15281529
"""Usage of std::array of PODs"""
15291530

@@ -1547,6 +1548,7 @@ def test02_array_of_pods(self):
15471548
assert a[2].px == 6
15481549
assert a[2].py == 7
15491550

1551+
@mark.xfail(condition=(IS_MAC and not IS_CLANG_REPL), reason="fails on OSX-Cling")
15501552
def test03_array_of_pointer_to_pods(self):
15511553
"""Usage of std::array of pointer to PODs"""
15521554

@@ -1887,7 +1889,7 @@ def setup_class(cls):
18871889
cls.stltypes = cppyy.load_reflection_info(cls.test_dct)
18881890
cls.N = cppyy.gbl.N
18891891

1890-
@mark.xfail
1892+
@mark.xfail(condition=(IS_MAC and not IS_CLANG_REPL), reason="fails on OSX-Cling")
18911893
def test01_pair_pack_unpack(self):
18921894
"""Pack/unpack pairs"""
18931895

@@ -1907,6 +1909,7 @@ def setup_class(cls):
19071909
import cppyy
19081910
cls.stltypes = cppyy.load_reflection_info(cls.test_dct)
19091911

1912+
@mark.xfail(condition=(IS_MAC and not IS_CLANG_REPL), reason="fails on OSX-Cling")
19101913
def test01_basics(self):
19111914
"""Test behavior of std::exception derived classes"""
19121915

test/test_templates.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import py, os
22
from pytest import raises, mark
3-
from .support import setup_make, pylong, IS_CLANG_REPL, IS_CLANG_DEBUG, IS_MAC_X86, IS_MAC_ARM
3+
from .support import setup_make, pylong, IS_CLANG_REPL, IS_CLANG_DEBUG, IS_MAC_X86, IS_MAC_ARM, IS_MAC
44

55
currpath = py.path.local(__file__).dirpath()
66
test_dct = str(currpath.join("templatesDict"))
@@ -371,7 +371,7 @@ def test14_templated_return_type(self):
371371
assert rttest_make_tlist2(RTTest_SomeStruct1())
372372
assert rttest_make_tlist2(RTTest_SomeNamespace.RTTest_SomeStruct2())
373373

374-
@mark.xfail
374+
@mark.xfail(condition=(IS_MAC and not IS_CLANG_REPL), reason="fails on OSX-Cling")
375375
def test15_rvalue_templates(self):
376376
"""Use of a template with r-values; should accept builtin types"""
377377

@@ -1155,7 +1155,7 @@ def test33_using_template_argument(self):
11551155
assert ns.testptr
11561156
assert cppyy.gbl.std.vector[ns.testptr]
11571157

1158-
@mark.xfail(run=not((IS_MAC_ARM or IS_MAC_X86) and not IS_CLANG_REPL))
1158+
@mark.xfail(condition=IS_MAC, run=IS_CLANG_REPL, reason="fails on OSX & crashes with cling")
11591159
def test34_cstring_template_argument(self):
11601160
"""`const char*` use over std::string"""
11611161

0 commit comments

Comments
 (0)