Skip compiling diamond pattern tests by default

Author: yeganer

tests/test_virtual_functions.cpp

@@ -472,6 +472,11 @@ class Final: public virtual Interface {
     }
 };
 
+#ifndef RUN_DIAMOND
+#define RUN_DIAMOND 0
+#endif /* ifndef RUN_DIAMOND */
+
+#if RUN_DIAMOND
 class B_Concrete: public virtual Interface {
 public:
     virtual int run(Interface* ptr) {
@@ -496,10 +501,13 @@ class Diamond: public C_Concrete, public B_Concrete {
 #pragma warning(pop)
 #endif
 
+#endif /* if RUN_DIAMOND */
+
 void initialize_virtual_inheritance(py::module &m) {
     py::class_<Interface>(m, "Interface").def("run", &Interface::run);
     py::class_<Final, Interface>(m, "Final").def(py::init<>());
 
+#if RUN_DIAMOND
     py::class_<B_Concrete, Interface>(m, "B_Concrete");
     py::class_<C_Concrete, Interface>(m, "C_Concrete");
     py::class_<Diamond, B_Concrete, C_Concrete>(m, "Diamond").def(py::init<>());
@@ -508,4 +516,5 @@ void initialize_virtual_inheritance(py::module &m) {
           Diamond d = Diamond();
           return d.run(&d);
           }, "Runs the diamond test in c++");
+#endif /* if RUN_DIAMOND */
 }

tests/test_virtual_functions.py

@@ -40,7 +40,9 @@ def get_string2(self):
 
     with pytest.raises(RuntimeError) as excinfo:
         m.runExampleVirtVirtual(ex12)
-    assert msg(excinfo.value) == 'Tried to call pure virtual function "ExampleVirt::pure_virtual"'
+    assert msg(
+        excinfo.value
+    ) == 'Tried to call pure virtual function "ExampleVirt::pure_virtual"'
 
     ex12p = ExtendedExampleVirt(10)
     with capture:
@@ -79,6 +81,7 @@ def test_alias_delay_initialization1(capture):
     If we just create and use an A instance directly, the trampoline initialization is
     bypassed and we only initialize an A() instead (for performance reasons).
     """
+
     class B(m.A):
         def __init__(self):
             super(B, self).__init__()
@@ -115,6 +118,7 @@ def test_alias_delay_initialization2(capture):
     performance penalty, it also allows us to do more things with the trampoline
     class such as defining local variables and performing construction/destruction.
     """
+
     class B2(m.A2):
         def __init__(self):
             super(B2, self).__init__()
@@ -160,7 +164,8 @@ def f(self):
 # PyPy: Reference count > 1 causes call with noncopyable instance
 # to fail in ncv1.print_nc()
 @pytest.unsupported_on_pypy
-@pytest.mark.skipif(not hasattr(m, "NCVirt"), reason="NCVirt test broken on ICPC")
+@pytest.mark.skipif(
+    not hasattr(m, "NCVirt"), reason="NCVirt test broken on ICPC")
 def test_move_support():
     class NCVirtExt(m.NCVirt):
         def get_noncopyable(self, a, b):
@@ -209,6 +214,7 @@ def get_movable(self, a, b):
 
 def test_dispatch_issue(msg):
     """#159: virtual function dispatch has problems with similar-named functions"""
+
     class PyClass1(m.DispatchIssue):
         def dispatch(self):
             return "Yay.."
@@ -217,7 +223,9 @@ class PyClass2(m.DispatchIssue):
         def dispatch(self):
             with pytest.raises(RuntimeError) as excinfo:
                 super(PyClass2, self).dispatch()
-            assert msg(excinfo.value) == 'Tried to call pure virtual function "Base::dispatch"'
+            assert msg(
+                excinfo.value
+            ) == 'Tried to call pure virtual function "Base::dispatch"'
 
             p = PyClass1()
             return m.dispatch_issue_go(p)
@@ -372,9 +380,12 @@ def lucky_number(self):
 
 
 def test_virtual_inheritance():
-
     final = m.Final()
     assert final.run(final) == 6
-    diamond = m.Diamond()
-    assert diamond.run(diamond) == 4
-    assert m.run_virtual_inheritance() == 4
+    try:
+        diamond = m.Diamond()
+    except AttributeError:
+        pass
+    else:
+        assert diamond.run(diamond) == 4
+        assert m.run_virtual_inheritance() == 4