Merge pull request #3352 from lukeyeager/bvlc/pytest-python-layer

Skip python layer tests if WITH_PYTHON_LAYER unset

python/caffe/test/test_python_layer.py

@@ -77,6 +77,8 @@ def parameter_net_file():
         return f.name
 
 
+@unittest.skipIf('Python' not in caffe.layer_type_list(),
+    'Caffe built without Python layer support')
 class TestPythonLayer(unittest.TestCase):
     def setUp(self):
         net_file = python_net_file()

python/caffe/test/test_python_layer_with_param_str.py

@@ -38,6 +38,8 @@ def python_param_net_file():
         return f.name
 
 
+@unittest.skipIf('Python' not in caffe.layer_type_list(),
+    'Caffe built without Python layer support')
 class TestLayerWithParam(unittest.TestCase):
     def setUp(self):
         net_file = python_param_net_file()