mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-04 19:51:05 +01:00
Jon Ross-PerkinsandChandler Carruth
941e60ade6
This is really part of #2811, but is extracted out to allow a little review in parallelism because #2811 expects #2813. Getting this in will allow migration of toolchain tests, whereas #2811 is focused on explorer tests. For explorer test timing information, see #2811. The syntax being used for matching deliberately mirrors the `FileCheck` setup, partly for compatibility if something changes, partly so there's nothing new to learn, partly so that we don't need to build more test updating. Individual tests look like: ``` [ RUN ] ParseAndExecuteTestFile.explorer/parse_and_execute/testdata/assert/convert.carbon To test this file alone, run: bazel test //explorer/parse_and_execute:file_test.subset --test_arg=explorer/parse_and_execute/testdata/assert/convert.carbon [ OK ] ParseAndExecuteTestFile.explorer/parse_and_execute/testdata/assert/convert.carbon (202 ms) ``` The printed command line is intended to assist developers in debugging a single test, particularly when sharding the main test. The use of a single `.subset` target means the total number of targets is constant even as the number of test files increases, which may be important for some `bazel` execution environments. I plan to make similar changes to the `glob_sh_run` implementation so that we have consistent setups, i.e. that we no longer create target-per-file scaling risks. This uses `native_test` to share the test binary, avoiding re-linking if files are individually run. Investigation did reveal a mistake where STDOUT/STDERR wasn't prefixed on empty output lines; this PR fixes that mistake, so that output is fully covered. Co-authored-by: Chandler Carruth <chandlerc@gmail.com>
37 lines
867 B
Python
37 lines
867 B
Python
"""Merges stdout and stderr into a single stream with labels."""
|
|
|
|
__copyright__ = """
|
|
Part of the Carbon Language project, under the Apache License v2.0 with LLVM
|
|
Exceptions. See /LICENSE for license information.
|
|
SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
"""
|
|
|
|
import subprocess
|
|
import sys
|
|
|
|
|
|
def _print(output: str, label: str) -> None:
|
|
if output:
|
|
for line in output.splitlines():
|
|
if line:
|
|
print(f"{label}: {line}")
|
|
else:
|
|
print(f"{label}:")
|
|
|
|
|
|
def main() -> None:
|
|
p = subprocess.run(
|
|
sys.argv[1:],
|
|
stdout=subprocess.PIPE,
|
|
stderr=subprocess.PIPE,
|
|
encoding="utf-8",
|
|
)
|
|
# The `lambda line` forces prefixes on empty lines.
|
|
_print(p.stdout, "STDOUT")
|
|
_print(p.stderr, "STDERR")
|
|
exit(p.returncode)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
main()
|