OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radeonsi/test: prettier output

Browse Source 
Acked-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12306>
This commit is contained in:
Pierre-Eric Pelloux-Prayer
2021-08-10 15:30:40 +02:00
parent 66709f1a40
commit a92367209f
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/gallium/drivers/radeonsi/ci/radeonsi-run-tests.py
View File

@@ -35,12 +35,16 @@ import multiprocessing
import csv import csv
def print_red(txt, end_line=True): def print_red(txt, end_line=True, prefix=None):
print("\033[0;31m", txt, "\033[0m", end="\n" if end_line else " ") if prefix:
print(prefix, end="")
print("\033[0;31m{}\033[0m".format(txt), end="\n" if end_line else " ")
def print_yellow(txt, end_line=True): def print_yellow(txt, end_line=True, prefix=None):
print("\033[1;33m", txt, "\033[0m", end="\n" if end_line else " ") if prefix:
print(prefix, end="")
print("\033[1;33m{}\033[0m".format(txt), end="\n" if end_line else " ")
parser = argparse.ArgumentParser(description="radeonsi tester") parser = argparse.ArgumentParser(description="radeonsi tester")
@@ -163,8 +167,12 @@ spin = itertools.cycle("-\\|/")
def run_cmd(args, verbosity, env=None): def run_cmd(args, verbosity, env=None):
if verbosity > 0: if verbosity > 1:
print_yellow("Running ", args) print_yellow(
"| Command line argument '"
+ " ".join(['"{}"'.format(a) for a in args])
+ "'"
)
start = datetime.now() start = datetime.now()
proc = subprocess.Popen( proc = subprocess.Popen(
args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=env args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=env
@@ -173,9 +181,9 @@ def run_cmd(args, verbosity, env=None):
line = proc.stdout.readline().decode() line = proc.stdout.readline().decode()
if verbosity > 0: if verbosity > 0:
if "ERROR" in line: if "ERROR" in line:
print_red(line.strip()) print_red(line.strip(), prefix="| ")
else: else:
print(line.strip()) print("| " + line.strip())
else: else:
sys.stdout.write(next(spin)) sys.stdout.write(next(spin))
sys.stdout.flush() sys.stdout.flush()
@@ -191,7 +199,10 @@ def run_cmd(args, verbosity, env=None):
if verbosity == 0: if verbosity == 0:
sys.stdout.write(" ... ") sys.stdout.write(" ... ")
print_yellow("Completed in {} seconds".format(int((end - start).total_seconds()))) print_yellow(
"Completed in {} seconds".format(int((end - start).total_seconds())),
prefix="└ " if verbosity > 0 else None,
)
def verify_results(baseline1, baseline2): def verify_results(baseline1, baseline2):