mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-28 11:40:10 +01:00
Jon Ross-Perkins
e111418b32
Adds a simple script to merge stdout/stderr and put on labels. This is hidden to the RUN line using lit.cfg.py. This is my solution to addressing how errors printed by the toolchain break sorting of stdout output; just put stdout first. We could also have toggles for interleaving output or such, which might help test whether we do it properly. This also moves some previous-distributed replacement logic into lit_autoupdate_base.py: I think having that adjacent to lit.cfg.py is probably the better choice, and it reduces duplication in toolchain scripts. It happens here because I need to change the resulting commands to include the merge.
30 lines
702 B
Python
30 lines
702 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
|
|
import textwrap
|
|
|
|
|
|
def main() -> None:
|
|
p = subprocess.run(
|
|
sys.argv[1:],
|
|
stdout=subprocess.PIPE,
|
|
stderr=subprocess.PIPE,
|
|
encoding="utf-8",
|
|
)
|
|
if p.stdout:
|
|
print(textwrap.indent(p.stdout, "STDOUT: "), end="")
|
|
if p.stderr:
|
|
print(textwrap.indent(p.stderr, "STDERR: "), end="")
|
|
exit(p.returncode)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
main()
|