Corrections to Cycles ctests
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 30 Jan 2015 10:13:09 +0000 (15:13 +0500)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 30 Jan 2015 10:13:09 +0000 (15:13 +0500)
- Apply VERBOSE to idiff result as well
- Don't treat verification failed error as unknown

tests/python/cycles_render_tests.py

index 815811f6cb83d9493c51b7fd1f3083773c98a919..e7435a261ae5437f0be429af1ddbc7a6924417dc 100755 (executable)
@@ -65,8 +65,10 @@ def verify_output(filepath):
     try:
         subprocess.check_output(command)
         return True
-    except subprocess.CalledProcessError as grepexc:
-        return grepexc.returncode == 1
+    except subprocess.CalledProcessError as e:
+        if VERBOSE:
+            print(e.output.decode("utf-8"))
+        return e.returncode == 1
 
 
 def run_test(filepath):
@@ -107,6 +109,8 @@ def run_all_tests(dirpath):
                 print('Can not perform tests because blender fails to start.',
                       'Make sure INSTALL target was run.')
                 return False
+            elif error == 'VARIFY':
+                pass
             else:
                 print("Unknown error %r" % error)
             testname = test_get_name(filepath)