[Bf-blender-cvs] [7d543e7] master: Corrections to Cycles ctests

[Sergey Sharybin]

Commit: 7d543e731012971f8627269800ed702486222062
Author: Sergey Sharybin
Date:   Fri Jan 30 15:13:09 2015 +0500
Branches: master
https://developer.blender.org/rB7d543e731012971f8627269800ed702486222062

Corrections to Cycles ctests

- Apply VERBOSE to idiff result as well
- Don't treat verification failed error as unknown

===================================================================

M	tests/python/cycles_render_tests.py

===================================================================

diff --git a/tests/python/cycles_render_tests.py b/tests/python/cycles_render_tests.py
index 815811f..e7435a2 100755
--- a/tests/python/cycles_render_tests.py
+++ b/tests/python/cycles_render_tests.py
@@ -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)