Skip to content

Commit

Permalink
[test] update tags
Browse files Browse the repository at this point in the history
  • Loading branch information
Vipul-Cariappa authored and vgvassilev committed Nov 16, 2024
1 parent f1c1946 commit 3540eff
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 10 deletions.
2 changes: 1 addition & 1 deletion test/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ all : $(dicts)

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

PLATFORM := $(shell uname -s)
ifeq ($(PLATFORM),Darwin)
Expand Down
2 changes: 1 addition & 1 deletion test/test_datatypes.py
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ def test01_instance_data_read_access(self):

c.__destruct__()

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

Expand Down
1 change: 0 additions & 1 deletion test/test_doc_features.py
Original file line number Diff line number Diff line change
Expand Up @@ -1093,7 +1093,6 @@ def setup_class(cls):

cppyy.gbl.talk_examples

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

Expand Down
2 changes: 1 addition & 1 deletion test/test_regression.py
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ def test08_typedef_identity(self):
assert not 'vector<const PyABC::S1*>' in dir(PyABC.S2)
assert PyABC.S2.S1_coll is cppyy.gbl.std.vector('const PyABC::S1*')

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

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

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

Expand Down
9 changes: 6 additions & 3 deletions test/test_stltypes.py
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ def test10_vector_std_distance(self):
assert std.distance(v.begin(), v.end()) == v.size()
assert std.distance[type(v).iterator](v.begin(), v.end()) == v.size()

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

Expand Down Expand Up @@ -673,7 +673,7 @@ def test18_array_interface(self):
v = np.array(v, dtype=np.intc)
assert ns.func(v) == sum(v)

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

Expand Down Expand Up @@ -1524,6 +1524,7 @@ def test01_array_of_basic_types(self):
a[i] = i
assert a[i] == i

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

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

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

Expand Down Expand Up @@ -1887,7 +1889,7 @@ def setup_class(cls):
cls.stltypes = cppyy.load_reflection_info(cls.test_dct)
cls.N = cppyy.gbl.N

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

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

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

Expand Down
6 changes: 3 additions & 3 deletions test/test_templates.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import py, os
from pytest import raises, mark
from .support import setup_make, pylong, IS_CLANG_REPL, IS_CLANG_DEBUG, IS_MAC_X86, IS_MAC_ARM
from .support import setup_make, pylong, IS_CLANG_REPL, IS_CLANG_DEBUG, IS_MAC_X86, IS_MAC_ARM, IS_MAC

currpath = py.path.local(__file__).dirpath()
test_dct = str(currpath.join("templatesDict"))
Expand Down Expand Up @@ -371,7 +371,7 @@ def test14_templated_return_type(self):
assert rttest_make_tlist2(RTTest_SomeStruct1())
assert rttest_make_tlist2(RTTest_SomeNamespace.RTTest_SomeStruct2())

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

Expand Down Expand Up @@ -1155,7 +1155,7 @@ def test33_using_template_argument(self):
assert ns.testptr
assert cppyy.gbl.std.vector[ns.testptr]

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

Expand Down

0 comments on commit 3540eff

Please sign in to comment.