Enable 2 xpass on Cling, and 1 on Clang-Repl

Author: aaronj0

test/test_cpp11features.py

@@ -44,6 +44,7 @@ def test01_smart_ptr(self):
             gc.collect()
             assert TestSmartPtr.s_counter == 0
 
+    @mark.xfail(run = False, condition=IS_LINUX_ARM, reason="Valgrind issues")
     def test02_smart_ptr_construction(self):
         """Shared/Unique pointer ctor is templated, requiring special care"""
 
@@ -433,7 +434,7 @@ def test14_shared_ptr_passing(self):
             gc.collect()
             assert TestSmartPtr.s_counter == 0
 
-    @mark.xfail(condition=(IS_MAC and IS_CLING), reason = "Fails on OS X Cling")
+    @mark.xfail(condition=IS_CLING, reason = "Fails on Cling")
     def test15_unique_ptr_template_deduction(self):
         """Argument type deduction with std::unique_ptr"""
 

test/test_templates.py

@@ -145,7 +145,7 @@ def test04_variadic_function(self):
 
         assert cppyy.gbl.test04_variadic_func['int', 'double', 'void*']() == 3
 
-    @mark.xfail(condition=IS_CLING, reason="Fails with Cling")
+    @mark.xfail(condition=IS_MAC and IS_CLING, reason="Fails with OSX Cling")
     def test05_variadic_overload(self):
         """Call an overloaded variadic function"""
 
@@ -476,7 +476,7 @@ def test18_greedy_overloads(self):
         assert g3.get_size(ns.SomeClass()) == cppyy.sizeof(ns.SomeClass)
         assert g3.get_size(cppyy.nullptr, True) == -1
 
-    @mark.xfail(condition = (IS_MAC and IS_CLING), reason = "Fails on OS X Cling")
+    @mark.xfail(condition = IS_CLING, reason = "Fails on Cling")
     def test19_templated_operator_add(self):
         """Templated operator+ is ambiguous: either __pos__ or __add__"""
 
@@ -587,7 +587,7 @@ def test23_overloaded_setitem(self):
         v = MyVec["float"](2)
         v[0] = 1        # used to throw TypeError
 
-    @mark.xfail(run=not IS_CLANG_REPL, reason="Crashes in ClangRepl")
+    @mark.xfail(condition=IS_MAC, reason="Fails on OS X")
     def test24_stdfunction_templated_arguments(self):
         """Use of std::function with templated arguments"""