Revert "Tests: speed up render tests by running multiple in the same process"

This makes finding the crashing tests harder, reverting until there is a
better solution.

This reverts commit 93901e7f0a.
This commit is contained in:
Brecht Van Lommel
2019-05-16 15:48:30 +02:00
parent bd0f26e2de
commit 3b51260387
5 changed files with 205 additions and 226 deletions

View File

@@ -49,61 +49,57 @@ if inside_blender:
sys.exit(1)
def render_files(filepaths, output_filepaths):
def render_file(filepath, output_filepath):
dirname = os.path.dirname(filepath)
basedir = os.path.dirname(dirname)
subject = os.path.basename(dirname)
frame_filepath = output_filepath + '0001.png'
command = [
BLENDER,
"--background",
"-noaudio",
"--factory-startup",
"--enable-autoexec"]
"--enable-autoexec",
filepath,
"-E", "BLENDER_EEVEE",
"-P",
os.path.realpath(__file__),
"-o", output_filepath,
"-F", "PNG",
"-f", "1"]
for filepath, output_filepath in zip(filepaths, output_filepaths):
frame_filepath = output_filepath + '0001.png'
if os.path.exists(frame_filepath):
os.remove(frame_filepath)
command.extend([
filepath,
"-E", "BLENDER_EEVEE",
"-P",
os.path.realpath(__file__),
"-o", output_filepath,
"-F", "PNG",
"-f", "1"])
error = None
try:
# Success
output = subprocess.check_output(command)
if VERBOSE:
print(" ".join(command))
print(output.decode("utf-8"))
except subprocess.CalledProcessError as e:
# Error
if VERBOSE:
print(" ".join(command))
print(e.output.decode("utf-8"))
error = "CRASH"
except BaseException as e:
# Crash
if VERBOSE:
print(" ".join(command))
print(e.decode("utf-8"))
error = "CRASH"
# Detect missing filepaths and consider those errors
errors = []
for output_filepath in output_filepaths:
frame_filepath = output_filepath + '0001.png'
if os.path.exists(frame_filepath):
shutil.copy(frame_filepath, output_filepath)
os.remove(frame_filepath)
errors.append(None)
else:
errors.append(error)
error = 'SKIPPED'
return errors
if VERBOSE:
print(" ".join(command))
print(output.decode("utf-8"))
return None
except subprocess.CalledProcessError as e:
# Error
if os.path.exists(frame_filepath):
os.remove(frame_filepath)
if VERBOSE:
print(" ".join(command))
print(e.output.decode("utf-8"))
if b"Error: engine not found" in e.output:
return "NO_ENGINE"
elif b"blender probably wont start" in e.output:
return "NO_START"
return "CRASH"
except BaseException as e:
# Crash
if os.path.exists(frame_filepath):
os.remove(frame_filepath)
if VERBOSE:
print(" ".join(command))
print(e)
return "CRASH"
def create_argparse():
@@ -133,7 +129,7 @@ def main():
report.set_pixelated(True)
report.set_reference_dir("eevee_renders")
report.set_compare_engines('eevee', 'cycles')
ok = report.run(test_dir, render_files)
ok = report.run(test_dir, render_file)
sys.exit(not ok)