From e7c30e803b511d68c0e7ccdf389d205d85a4e6a9 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Wed, 30 Aug 2023 14:04:40 -0400 Subject: tests: sync ninja stdout/stderr instead of listing them separately It is fairly confusing for all the "ninja explain" to be the last thing you see, instead of the compile error. --- run_project_tests.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/run_project_tests.py b/run_project_tests.py index af5b58db0..2290cd578 100755 --- a/run_project_tests.py +++ b/run_project_tests.py @@ -711,8 +711,8 @@ def _run_test(test: TestDef, # Build with subprocess def build_step() -> None: build_start = time.time() - pc, o, e = Popen_safe(compile_commands + dir_args, cwd=test_build_dir) - testresult.add_step(BuildStep.build, o, e, '', time.time() - build_start) + pc, o, _ = Popen_safe(compile_commands + dir_args, cwd=test_build_dir, stderr=subprocess.STDOUT) + testresult.add_step(BuildStep.build, o, '', '', time.time() - build_start) if should_fail == 'build': if pc.returncode != 0: raise testresult -- cgit v1.2.3