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
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-05-11 00:00:35 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-05-11 01:12:05 +0300
commit93901e7f0a05ba471f3b4c0201500d9dfcd68c2c (patch)
treedeae72a55e7aae68dd23dddc44f26b59952a64ea /tests/python/opengl_draw_tests.py
parent79b9596c667934a97e6f7050fd325d03d653bb60 (diff)
Tests: speed up render tests by running multiple in the same process
Blender startup time and shader compilation is a big factor when running hundreds of tests, so now all renders in the same ctest run in the same process. If a test crashes, the remaining tests in the same category will be marked as skipped. Benchmarked on a quad core with ctest -j8. cycles: 118.1s -> 94.3s eevee: 66.2s -> 29.2s workbench: 31.7s -> 8.6s
Diffstat (limited to 'tests/python/opengl_draw_tests.py')
-rwxr-xr-xtests/python/opengl_draw_tests.py79
1 files changed, 43 insertions, 36 deletions
diff --git a/tests/python/opengl_draw_tests.py b/tests/python/opengl_draw_tests.py
index 9913f875689..1cc5ddecf1d 100755
--- a/tests/python/opengl_draw_tests.py
+++ b/tests/python/opengl_draw_tests.py
@@ -31,41 +31,48 @@ if inside_blender:
sys.exit(0)
-def render_file(filepath, output_filepath):
- command = (
- BLENDER,
- "--no-window-focus",
- "--window-geometry",
- "0", "0", "1024", "768",
- "-noaudio",
- "--factory-startup",
- "--enable-autoexec",
- filepath,
- "-P",
- os.path.realpath(__file__),
- "--",
- output_filepath)
-
- try:
- # Success
- output = subprocess.check_output(command)
- if VERBOSE:
- print(output.decode("utf-8"))
- return None
- except subprocess.CalledProcessError as e:
- # Error
- if os.path.exists(output_filepath):
- os.remove(output_filepath)
- if VERBOSE:
- print(e.output.decode("utf-8"))
- return "CRASH"
- except BaseException as e:
- # Crash
- if os.path.exists(output_filepath):
- os.remove(output_filepath)
- if VERBOSE:
- print(e)
- return "CRASH"
+def render_files(filepaths, output_filepaths):
+ errors = []
+
+ for filepath, output_filepath in zip(filepaths, output_filepaths):
+ command = (
+ BLENDER,
+ "--no-window-focus",
+ "--window-geometry",
+ "0", "0", "1024", "768",
+ "-noaudio",
+ "--factory-startup",
+ "--enable-autoexec",
+ filepath,
+ "-P",
+ os.path.realpath(__file__),
+ "--",
+ output_filepath)
+
+ error = None
+ try:
+ # Success
+ output = subprocess.check_output(command)
+ if VERBOSE:
+ print(output.decode("utf-8"))
+ except subprocess.CalledProcessError as e:
+ # Error
+ if os.path.exists(output_filepath):
+ os.remove(output_filepath)
+ if VERBOSE:
+ print(e.output.decode("utf-8"))
+ error = "CRASH"
+ except BaseException as e:
+ # Crash
+ if os.path.exists(output_filepath):
+ os.remove(output_filepath)
+ if VERBOSE:
+ print(e)
+ error = "CRASH"
+
+ errors.append(error)
+
+ return errors
def create_argparse():
@@ -92,7 +99,7 @@ def main():
from modules import render_report
report = render_report.Report("OpenGL Draw Test Report", output_dir, idiff)
- ok = report.run(test_dir, render_file)
+ ok = report.run(test_dir, render_files)
sys.exit(not ok)