|
2 | 2 | from pytest import raises, skip, mark |
3 | 3 | from .support import setup_make, pylong, pyunicode, IS_CLANG_REPL, IS_MAC_X86, IS_MAC_ARM |
4 | 4 |
|
| 5 | +IS_MAC = IS_MAC_X86 or IS_MAC_ARM |
| 6 | + |
5 | 7 | currpath = py.path.local(__file__).dirpath() |
6 | 8 | test_dct = str(currpath.join("datatypesDict")) |
7 | 9 |
|
@@ -1274,7 +1276,7 @@ def run(self, f, buf, total): |
1274 | 1276 | if self.has_byte: |
1275 | 1277 | run(self, cppyy.gbl.sum_byte_data, buf, total) |
1276 | 1278 |
|
1277 | | - @mark.xfail(run=not IS_CLANG_REPL, reason="Crashes") |
| 1279 | + @mark.xfail(run=not(((IS_CLANG_REPL and IS_MAC) or (not IS_CLANG_REPL and IS_MAC))), reason="Crashes") |
1278 | 1280 | def test26_function_pointers(self): |
1279 | 1281 | """Function pointer passing""" |
1280 | 1282 |
|
@@ -1337,7 +1339,7 @@ def sum_in_python(i1, i2, i3): |
1337 | 1339 | ns = cppyy.gbl.FuncPtrReturn |
1338 | 1340 | assert ns.foo()() == "Hello, World!" |
1339 | 1341 |
|
1340 | | - @mark.xfail(run=not IS_CLANG_REPL, reason="Crashes") |
| 1342 | + @mark.xfail(run=not(((IS_CLANG_REPL and IS_MAC) or (not IS_CLANG_REPL and IS_MAC))), reason="Crashes") |
1341 | 1343 | def test27_callable_passing(self): |
1342 | 1344 | """Passing callables through function pointers""" |
1343 | 1345 |
|
@@ -1483,7 +1485,7 @@ def pyd(arg0, arg1): |
1483 | 1485 | gc.collect() |
1484 | 1486 | raises(TypeError, c, 3, 3) # lambda gone out of scope |
1485 | 1487 |
|
1486 | | - @mark.xfail(condition=IS_MAC_X86 or IS_MAC_ARM, reason="Fails on OS X") |
| 1488 | + @mark.xfail(condition=IS_MAC, reason="Fails on OS X") |
1487 | 1489 | def test29_std_function_life_lines(self): |
1488 | 1490 | """Life lines to std::function data members""" |
1489 | 1491 |
|
@@ -2211,7 +2213,7 @@ def test44_buffer_memory_handling(self): |
2211 | 2213 | assert buf1.data1[i] == 1.*i |
2212 | 2214 | assert buf1.data2[i] == 2.*i |
2213 | 2215 |
|
2214 | | - @mark.xfail(condition=IS_MAC_X86 or IS_MAC_ARM, reason="Fails on OS X") |
| 2216 | + @mark.xfail(condition=IS_MAC, reason="Fails on OS X") |
2215 | 2217 | def test45_const_ref_data(self): |
2216 | 2218 | """Proper indirection for addressing const-ref data""" |
2217 | 2219 |
|
|
0 commit comments