aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz93@gmail.com>2023-08-30 14:04:40 -0400
committerEli Schwartz <eschwartz93@gmail.com>2023-09-01 14:27:53 -0400
commite7c30e803b511d68c0e7ccdf389d205d85a4e6a9 (patch)
tree33f1fe761626b57acd6b5a81a450898795452f02
parent0ecc8d5c8da91f210ca5216faabda0e0ee222cf2 (diff)
downloadmeson-e7c30e803b511d68c0e7ccdf389d205d85a4e6a9.zip
meson-e7c30e803b511d68c0e7ccdf389d205d85a4e6a9.tar.gz
meson-e7c30e803b511d68c0e7ccdf389d205d85a4e6a9.tar.bz2
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.
-rwxr-xr-xrun_project_tests.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/run_project_tests.py b/run_project_tests.py
index af5b58d..2290cd5 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