|
1 | 1 | import py, os |
2 | 2 | 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 |
4 | 4 |
|
5 | 5 | currpath = py.path.local(__file__).dirpath() |
6 | 6 | test_dct = str(currpath.join("templatesDict")) |
@@ -145,7 +145,7 @@ def test04_variadic_function(self): |
145 | 145 |
|
146 | 146 | assert cppyy.gbl.test04_variadic_func['int', 'double', 'void*']() == 3 |
147 | 147 |
|
148 | | - @mark.xfail(condition=IS_CLING, reason="Fails with Cling") |
| 148 | + @mark.xfail(condition=IS_MAC and IS_CLING, reason="Fails with OSX Cling") |
149 | 149 | def test05_variadic_overload(self): |
150 | 150 | """Call an overloaded variadic function""" |
151 | 151 |
|
@@ -476,7 +476,7 @@ def test18_greedy_overloads(self): |
476 | 476 | assert g3.get_size(ns.SomeClass()) == cppyy.sizeof(ns.SomeClass) |
477 | 477 | assert g3.get_size(cppyy.nullptr, True) == -1 |
478 | 478 |
|
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") |
480 | 480 | def test19_templated_operator_add(self): |
481 | 481 | """Templated operator+ is ambiguous: either __pos__ or __add__""" |
482 | 482 |
|
@@ -587,7 +587,7 @@ def test23_overloaded_setitem(self): |
587 | 587 | v = MyVec["float"](2) |
588 | 588 | v[0] = 1 # used to throw TypeError |
589 | 589 |
|
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") |
591 | 591 | def test24_stdfunction_templated_arguments(self): |
592 | 592 | """Use of std::function with templated arguments""" |
593 | 593 |
|
@@ -742,6 +742,7 @@ def test26_partial_templates(self): |
742 | 742 | assert ns.bar2['double'](17) == 17 |
743 | 743 | assert ns.bar2['double','int'](17) == 17 |
744 | 744 |
|
| 745 | + @mark.xfail(condition=IS_MAC and IS_CLING, reason="Fails on OS X and Cling") |
745 | 746 | def test27_variadic_constructor(self): |
746 | 747 | """Use of variadic template function as contructor""" |
747 | 748 |
|
@@ -776,7 +777,7 @@ class Atom { |
776 | 777 | a = ns.Atom(1567.0) |
777 | 778 | assert a.m_m == 1567.0 |
778 | 779 |
|
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 ") |
780 | 781 | def test28_enum_in_constructor(self): |
781 | 782 | """Use of enums in template function as constructor""" |
782 | 783 |
|
@@ -1120,7 +1121,7 @@ class TNaVU; |
1120 | 1121 | run_n = getattr(cppyy.gbl, 'TNaRun_%d' % n) |
1121 | 1122 | getattr(run_n, t) |
1122 | 1123 |
|
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") |
1124 | 1125 | def test33_using_template_argument(self): |
1125 | 1126 | """`using` type as template argument""" |
1126 | 1127 |
|
|
0 commit comments