Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-01-30 13:13:09 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-01-30 13:13:09 +0300
commit7d543e731012971f8627269800ed702486222062 (patch)
tree697161d32077fdcf406613641846a45cd915c1c2 /tests
parenta3c13fa9e80fdb0334c9fb0fb8ba771c9862ebb9 (diff)
Corrections to Cycles ctests
- Apply VERBOSE to idiff result as well - Don't treat verification failed error as unknown
Diffstat (limited to 'tests')
-rwxr-xr-xtests/python/cycles_render_tests.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/python/cycles_render_tests.py b/tests/python/cycles_render_tests.py
index 815811f6cb8..e7435a261ae 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)