Skip to content

Commit 5310ccb

Browse files
committed
tags: OS X , valgrind with clang18, 2 xpass
1 parent 67a1af4 commit 5310ccb

File tree

6 files changed

+17
-12
lines changed

6 files changed

+17
-12
lines changed

test/test_conversions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ def test03_error_handling(self):
8787
gc.collect()
8888
assert CC.s_count == 0
8989

90-
@mark.xfail(run = not(IS_LINUX and IS_CLING), condition = ((IS_MAC and IS_CLANG_REPL) or (IS_LINUX and IS_CLING)), reason = "Fails on OS X + Clang-Repl, Crashes on Linux + Cling")
90+
@mark.xfail(run = not(IS_LINUX and IS_CLING), condition = IS_MAC or IS_CLING, reason = "Fails on OS X + Cling, Crashes on Linux + Cling")
9191
def test04_implicit_conversion_from_tuple(self):
9292
"""Allow implicit conversions from tuples as arguments {}-like"""
9393

test/test_cpp11features.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import py, os, sys
22
from pytest import raises, mark
3-
from .support import setup_make, ispypy, IS_CLANG_REPL, IS_LINUX_ARM, IS_MAC, IS_CLING
3+
from .support import setup_make, ispypy, IS_CLANG_REPL, IS_LINUX_ARM, IS_LINUX, IS_MAC, IS_CLING
44

55

66
currpath = py.path.local(__file__).dirpath()
@@ -44,6 +44,7 @@ def test01_smart_ptr(self):
4444
gc.collect()
4545
assert TestSmartPtr.s_counter == 0
4646

47+
@mark.xfail(run = False, condition=IS_LINUX_ARM, reason="Valgrind issues")
4748
def test02_smart_ptr_construction(self):
4849
"""Shared/Unique pointer ctor is templated, requiring special care"""
4950

@@ -71,6 +72,7 @@ class C(TestSmartPtr):
7172
gc.collect()
7273
assert TestSmartPtr.s_counter == 0
7374

75+
@mark.xfail(run = False, condition = IS_LINUX, reason = "Passes, but Valgrind issue")
7476
def test03_smart_ptr_memory_handling(self):
7577
"""Test shared/unique pointer memory ownership"""
7678

@@ -433,7 +435,7 @@ def test14_shared_ptr_passing(self):
433435
gc.collect()
434436
assert TestSmartPtr.s_counter == 0
435437

436-
@mark.xfail(condition=(IS_MAC and IS_CLING), reason = "Fails on OS X Cling")
438+
@mark.xfail(condition=IS_CLING, reason = "Fails on Cling")
437439
def test15_unique_ptr_template_deduction(self):
438440
"""Argument type deduction with std::unique_ptr"""
439441

test/test_crossinheritance.py

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

55

66
currpath = py.path.local(__file__).dirpath()
@@ -405,6 +405,7 @@ def call(self):
405405
gc.collect()
406406
assert CB.s_count == 0 + start_count
407407

408+
@mark.xfail(run = False, condition = IS_LINUX, reason = "Passes, but Valgrind issue")
408409
def test12_python_shared_ptr_memory(self):
409410
"""Usage of Python derived objects with std::shared_ptr"""
410411

@@ -1033,7 +1034,7 @@ def return_const(self):
10331034
assert a.return_const().m_value == "abcdef"
10341035
assert ns.callit(a).m_value == "abcdef"
10351036

1036-
@mark.xfail(condition = IS_MAC and IS_CLANG_REPL, reason = "Fails on OS X Clang-REPL")
1037+
@mark.xfail(condition = IS_MAC, reason = "Fails on OS X")
10371038
def test24_non_copyable(self):
10381039
"""Inheriting from a non-copyable base class"""
10391040

test/test_datatypes.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2049,6 +2049,7 @@ def test40_more_aggregates(self):
20492049
r2 = ns.make_R2()
20502050
assert r2.s.x == 1
20512051

2052+
@mark.xfail(condition=IS_MAC and IS_CLING, reason="Fails on OS X and Cling")
20522053
def test41_complex_numpy_arrays(self):
20532054
"""Usage of complex numpy arrays"""
20542055

test/test_stltypes.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1757,7 +1757,7 @@ def test03_initialize_from_set(self):
17571757
with raises(TypeError):
17581758
s = cppyy.gbl.std.set[int](set(["aap", "noot", "mies"]))
17591759

1760-
@mark.xfail
1760+
@mark.xfail(run=not(IS_MAC and IS_CLING))
17611761
def test04_set_cpp17_style(self):
17621762
"""C++17 style initialization of std::set"""
17631763

test/test_templates.py

Lines changed: 7 additions & 6 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_CLING, IS_CLANG_DEBUG, IS_MAC_X86, IS_MAC_ARM, IS_MAC
3+
from .support import setup_make, pylong, IS_CLANG_REPL, IS_CLING, IS_CLANG_DEBUG, IS_MAC_X86, IS_MAC_ARM, IS_MAC, IS_LINUX
44

55
currpath = py.path.local(__file__).dirpath()
66
test_dct = str(currpath.join("templatesDict"))
@@ -145,7 +145,7 @@ def test04_variadic_function(self):
145145

146146
assert cppyy.gbl.test04_variadic_func['int', 'double', 'void*']() == 3
147147

148-
@mark.xfail(condition=IS_CLING, reason="Fails with Cling")
148+
@mark.xfail(condition=IS_MAC and IS_CLING, reason="Fails with OSX Cling")
149149
def test05_variadic_overload(self):
150150
"""Call an overloaded variadic function"""
151151

@@ -476,7 +476,7 @@ def test18_greedy_overloads(self):
476476
assert g3.get_size(ns.SomeClass()) == cppyy.sizeof(ns.SomeClass)
477477
assert g3.get_size(cppyy.nullptr, True) == -1
478478

479-
@mark.xfail(condition = (IS_MAC and IS_CLING), reason = "Fails on OS X Cling")
479+
@mark.xfail(condition = IS_CLING, reason = "Fails on Cling")
480480
def test19_templated_operator_add(self):
481481
"""Templated operator+ is ambiguous: either __pos__ or __add__"""
482482

@@ -587,7 +587,7 @@ def test23_overloaded_setitem(self):
587587
v = MyVec["float"](2)
588588
v[0] = 1 # used to throw TypeError
589589

590-
@mark.xfail(run=not IS_CLANG_REPL, reason="Crashes in ClangRepl")
590+
@mark.xfail(condition=IS_MAC and IS_CLING, reason="Fails on OS X Cling")
591591
def test24_stdfunction_templated_arguments(self):
592592
"""Use of std::function with templated arguments"""
593593

@@ -742,6 +742,7 @@ def test26_partial_templates(self):
742742
assert ns.bar2['double'](17) == 17
743743
assert ns.bar2['double','int'](17) == 17
744744

745+
@mark.xfail(condition=IS_MAC and IS_CLING, reason="Fails on OS X and Cling")
745746
def test27_variadic_constructor(self):
746747
"""Use of variadic template function as contructor"""
747748

@@ -776,7 +777,7 @@ class Atom {
776777
a = ns.Atom(1567.0)
777778
assert a.m_m == 1567.0
778779

779-
@mark.xfail(condition = IS_MAC and IS_CLANG_REPL, reason = "Fails on OS X Clang-REPL")
780+
@mark.xfail(condition = IS_MAC, reason = "Fails on OS X ")
780781
def test28_enum_in_constructor(self):
781782
"""Use of enums in template function as constructor"""
782783

@@ -1120,7 +1121,7 @@ class TNaVU;
11201121
run_n = getattr(cppyy.gbl, 'TNaRun_%d' % n)
11211122
getattr(run_n, t)
11221123

1123-
@mark.xfail(run=False, condition=not(IS_MAC and IS_CLING), reason="Crashes on OS X + Cling")
1124+
@mark.xfail(run=not(IS_MAC and IS_CLING), reason="Crashes on OS X + Cling")
11241125
def test33_using_template_argument(self):
11251126
"""`using` type as template argument"""
11261127

0 commit comments

Comments
 (0)