From eab1cbe8db0cc3982e8211bc66c2f37f51c1b317 Mon Sep 17 00:00:00 2001 From: toofar Date: Sun, 23 Jul 2023 20:49:32 +1200 Subject: Revert "Print stdout/err on debug build smoke tests too." This reverts commit 23979c147fae27e32af8812346a56bef18d89c3e. --- scripts/dev/build_release.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/dev/build_release.py b/scripts/dev/build_release.py index a2ec58a49..7547bf843 100755 --- a/scripts/dev/build_release.py +++ b/scripts/dev/build_release.py @@ -183,6 +183,10 @@ def smoke_test(executable: pathlib.Path, debug: bool, qt5: bool) -> None: ]) proc = _smoke_test_run(executable) + if debug: + print("Skipping output check for debug build") + proc.check_returncode() + return stdout = '\n'.join(_filter_whitelisted(proc.stdout, stdout_whitelist)) stderr = '\n'.join(_filter_whitelisted(proc.stderr, stderr_whitelist)) @@ -191,13 +195,9 @@ def smoke_test(executable: pathlib.Path, debug: bool, qt5: bool) -> None: print( f"Unexpected output, running with --debug (returncode={proc.returncode})" ) - if debug: - debug_stdout = None - debug_stderr = None - else: - proc = _smoke_test_run(executable, '--debug') - debug_stdout = proc.stdout.decode('utf-8') - debug_stderr = proc.stderr.decode('utf-8') + proc = _smoke_test_run(executable, '--debug') + debug_stdout = proc.stdout.decode('utf-8') + debug_stderr = proc.stderr.decode('utf-8') lines = [ "Unexpected output!", -- cgit v1.2.3-54-g00ecf