mirror of
https://github.com/blender/blender
synced 2026-11-01 03:16:58 +03:00
72f8c89b77
Initially noted by devops as a problem: UI tests when crashing spawn our crash dialog, that will just sit there for 1200 seconds until the CI environment decides the test has failed and kills the process, clicking away the dialog also works, but neither option is ideal here. The crash handler knows when we are in background mode, (`-B`) and suppresses this dialog so this is why it has not been an issue for the normal tests. However when we do crash we get an unhelpful message saying `Writing: blender.crash.txt` which is not collected by buildbot so unless a developer can get a devops person to go retrieve this file its contents will be left to ones imagination. This PR adds a `--console-crash-handler` argument that does two things: 1 - Suppress the crash dialog even when we are not in background mode 2 - Rather than writing the crash data to blender.crash.txt write this information to stderr so it shows up in the CI logs. It also updates all invocations of blender I could find in our test scripts to pass this new flag. The benchmark scripts have not been updated as they regularly run against older blender versions that may not support the new flag. Pull Request: https://projects.blender.org/blender/blender/pulls/159983
68 lines
1.7 KiB
Python
68 lines
1.7 KiB
Python
#!/usr/bin/env python3
|
|
# SPDX-FileCopyrightText: 2015-2022 Blender Authors
|
|
#
|
|
# SPDX-License-Identifier: Apache-2.0
|
|
|
|
__all__ = (
|
|
"main",
|
|
)
|
|
|
|
import argparse
|
|
import os
|
|
import sys
|
|
from pathlib import Path
|
|
|
|
|
|
def get_arguments(filepath, output_filepath):
|
|
dirname = os.path.dirname(filepath)
|
|
basedir = os.path.dirname(dirname)
|
|
|
|
args = [
|
|
"--background",
|
|
"--factory-startup",
|
|
"--enable-autoexec",
|
|
"--debug-memory",
|
|
"--debug-exit-on-error",
|
|
"--console-crash-handler",
|
|
filepath,
|
|
"-E", "CYCLES",
|
|
"-o", output_filepath,
|
|
"-F", "PNG",
|
|
"--python", os.path.join(basedir, "util", "import_svg.py"),
|
|
"-f", "1",
|
|
]
|
|
|
|
return args
|
|
|
|
|
|
def create_argparse():
|
|
parser = argparse.ArgumentParser(
|
|
description="Run test script for each blend file in TESTDIR, comparing the render result with known output."
|
|
)
|
|
parser.add_argument("--blender", required=True)
|
|
parser.add_argument("--testdir", required=True)
|
|
parser.add_argument("--outdir", required=True)
|
|
parser.add_argument("--oiiotool", required=True)
|
|
parser.add_argument('--batch', default=False, action='store_true')
|
|
return parser
|
|
|
|
|
|
def main():
|
|
parser = create_argparse()
|
|
args = parser.parse_args()
|
|
|
|
from modules import render_report
|
|
report = render_report.Report('IO Curve SVG', args.outdir, args.oiiotool)
|
|
report.set_pixelated(True)
|
|
|
|
test_dir_name = Path(args.testdir).name
|
|
if test_dir_name == 'complex':
|
|
report.set_fail_percent(0.01)
|
|
|
|
ok = report.run(args.testdir, args.blender, get_arguments, batch=args.batch)
|
|
|
|
sys.exit(not ok)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
main()
|