From da6ff429b18186b4db8ff82f3f3019bc320d0a4f Mon Sep 17 00:00:00 2001 From: toofar Date: Sun, 16 Jul 2023 23:07:10 +1200 Subject: don't recurse smoke test errors with --debug --- scripts/dev/build_release.py | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/scripts/dev/build_release.py b/scripts/dev/build_release.py index c7cebbe3a..6259a72ac 100755 --- a/scripts/dev/build_release.py +++ b/scripts/dev/build_release.py @@ -187,12 +187,19 @@ def smoke_test(executable: pathlib.Path, debug: bool, qt5: bool) -> None: stderr = '\n'.join(_filter_whitelisted(proc.stderr, stderr_whitelist)) if stdout or stderr or proc.returncode > 0: - print( - f"Unexpected output, running with --debug (returncode={proc.returncode})" - ) - proc = _smoke_test_run(executable, '--debug') - debug_stdout = proc.stdout.decode('utf-8') - debug_stderr = proc.stderr.decode('utf-8') + if debug: + print( + f"Unexpected output (errno={proc.returncode})" + ) + debug_stdout = None + debug_stderr = None + else: + print( + f"Unexpected output, running with --debug (errno={proc.returncode})" + ) + proc = _smoke_test_run(executable, '--debug') + debug_stdout = proc.stdout.decode('utf-8') + debug_stderr = proc.stderr.decode('utf-8') lines = [ "Unexpected output!", @@ -232,7 +239,7 @@ def smoke_test(executable: pathlib.Path, debug: bool, qt5: bool) -> None: ] if debug: - print("Skipping output check for debug build") + print("Not raising smoke test error for debug build") return raise Exception("\n".join(lines)) # pylint: disable=broad-exception-raised -- cgit v1.2.3-54-g00ecf