Github/littlefs
1
Fork 0
Code Actions Activity

scripts: Added -q/--quiet to test.py/bench.py

Browse Source 
This will probably only have niche uses, but may be useful for small
test sets or for running specific tests with -O-.

Though it is a bit funny that -q -O- turns test.py/bench.py into more or
less just a complicated way to run a C program.
This commit is contained in:
Christopher Haster
2024-11-17 23:50:32 -06:00
parent 0b450b1184
commit 51b8cdb1f0
2 changed files with 56 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/bench.py
+28 -20
View File
@@ -1223,7 +1223,8 @@ def run_stage(name, runner, bench_ids, stdout_, trace_, output_, **args):
daemon=True)) daemon=True))
def print_update(done): def print_update(done):
if (not args.get('verbose') if (not args.get('quiet')
and not args.get('verbose')
and not args.get('stdout') == '-' and not args.get('stdout') == '-'
and (args['color'] or done)): and (args['color'] or done)):
sys.stdout.write('%s%srunning %s%s:%s %s%s' % ( sys.stdout.write('%s%srunning %s%s:%s %s%s' % (
@@ -1284,8 +1285,9 @@ def run_stage(name, runner, bench_ids, stdout_, trace_, output_, **args):
def run(runner, bench_ids=[], **args): def run(runner, bench_ids=[], **args):
# query runner for benches # query runner for benches
print('using runner: %s' % ' '.join( if not args.get('quiet'):
shlex.quote(c) for c in find_runner(runner, **args))) print('using runner: %s' % ' '.join(
shlex.quote(c) for c in find_runner(runner, **args)))
# query ids, perms, etc # query ids, perms, etc
bench_ids = find_ids(runner, bench_ids, **args) bench_ids = find_ids(runner, bench_ids, **args)
@@ -1294,12 +1296,13 @@ def run(runner, bench_ids=[], **args):
expected_case_perms, expected_case_perms,
expected_perms, expected_perms,
total_perms) = find_perms(runner, bench_ids, **args) total_perms) = find_perms(runner, bench_ids, **args)
print('found %d suites, %d cases, %d/%d permutations' % ( if not args.get('quiet'):
len(expected_suite_perms), print('found %d suites, %d cases, %d/%d permutations' % (
len(expected_case_perms), len(expected_suite_perms),
expected_perms, len(expected_case_perms),
total_perms)) expected_perms,
print() total_perms))
print()
# automatic job detection? # automatic job detection?
if args.get('jobs') == 0: if args.get('jobs') == 0:
@@ -1377,17 +1380,18 @@ def run(runner, bench_ids=[], **args):
output.close() output.close()
# show summary # show summary
print() if not args.get('quiet'):
print('%sdone:%s %s' % ( print()
('\x1b[34m' if not failed else '\x1b[31m') print('%sdone:%s %s' % (
if args['color'] else '', ('\x1b[34m' if not failed else '\x1b[31m')
'\x1b[m' if args['color'] else '', if args['color'] else '',
', '.join(filter(None, [ '\x1b[m' if args['color'] else '',
'%d readed' % readed, ', '.join(filter(None, [
'%d proged' % proged, '%d readed' % readed,
'%d erased' % erased, '%d proged' % proged,
'in %.2fs' % (stop-start)])))) '%d erased' % erased,
print() 'in %.2fs' % (stop-start)]))))
print()
# print each failure # print each failure
for failure in failures[:args.get('failures', 3)]: for failure in failures[:args.get('failures', 3)]:
@@ -1505,6 +1509,10 @@ if __name__ == "__main__":
'-v', '--verbose', '-v', '--verbose',
action='store_true', action='store_true',
help="Output commands that run behind the scenes.") help="Output commands that run behind the scenes.")
parser.add_argument(
'-q', '--quiet',
action='store_true',
help="Show nothing except for bench failures.")
parser.add_argument( parser.add_argument(
'--color', '--color',
choices=['never', 'always', 'auto'], choices=['never', 'always', 'auto'],
scripts/test.py
+28 -20
View File
@@ -1207,7 +1207,8 @@ def run_stage(name, runner, test_ids, stdout_, trace_, output_, **args):
daemon=True)) daemon=True))
def print_update(done): def print_update(done):
if (not args.get('verbose') if (not args.get('quiet')
and not args.get('verbose')
and not args.get('stdout') == '-' and not args.get('stdout') == '-'
and (args['color'] or done)): and (args['color'] or done)):
sys.stdout.write('%s%srunning %s%s:%s %s%s' % ( sys.stdout.write('%s%srunning %s%s:%s %s%s' % (
@@ -1268,8 +1269,9 @@ def run_stage(name, runner, test_ids, stdout_, trace_, output_, **args):
def run(runner, test_ids=[], **args): def run(runner, test_ids=[], **args):
# query runner for tests # query runner for tests
print('using runner: %s' % ' '.join( if not args.get('quiet'):
shlex.quote(c) for c in find_runner(runner, **args))) print('using runner: %s' % ' '.join(
shlex.quote(c) for c in find_runner(runner, **args)))
# query ids, perms, etc # query ids, perms, etc
test_ids = find_ids(runner, test_ids, **args) test_ids = find_ids(runner, test_ids, **args)
@@ -1278,12 +1280,13 @@ def run(runner, test_ids=[], **args):
expected_case_perms, expected_case_perms,
expected_perms, expected_perms,
total_perms) = find_perms(runner, test_ids, **args) total_perms) = find_perms(runner, test_ids, **args)
print('found %d suites, %d cases, %d/%d permutations' % ( if not args.get('quiet'):
len(expected_suite_perms), print('found %d suites, %d cases, %d/%d permutations' % (
len(expected_case_perms), len(expected_suite_perms),
expected_perms, len(expected_case_perms),
total_perms)) expected_perms,
print() total_perms))
print()
# automatic job detection? # automatic job detection?
if args.get('jobs') == 0: if args.get('jobs') == 0:
@@ -1355,17 +1358,18 @@ def run(runner, test_ids=[], **args):
output.close() output.close()
# show summary # show summary
print() if not args.get('quiet'):
print('%sdone:%s %s' % ( print()
('\x1b[32m' if not failed else '\x1b[31m') print('%sdone:%s %s' % (
if args['color'] else '', ('\x1b[32m' if not failed else '\x1b[31m')
'\x1b[m' if args['color'] else '', if args['color'] else '',
', '.join(filter(None, [ '\x1b[m' if args['color'] else '',
'%d/%d passed' % (passed, expected), ', '.join(filter(None, [
'%d/%d failed' % (failed, expected), '%d/%d passed' % (passed, expected),
'%dpls!' % powerlosses if powerlosses else None, '%d/%d failed' % (failed, expected),
'in %.2fs' % (stop-start)])))) '%dpls!' % powerlosses if powerlosses else None,
print() 'in %.2fs' % (stop-start)]))))
print()
# print each failure # print each failure
for failure in failures[:args.get('failures', 3)]: for failure in failures[:args.get('failures', 3)]:
@@ -1521,6 +1525,10 @@ if __name__ == "__main__":
'-v', '--verbose', '-v', '--verbose',
action='store_true', action='store_true',
help="Output commands that run behind the scenes.") help="Output commands that run behind the scenes.")
parser.add_argument(
'-q', '--quiet',
action='store_true',
help="Show nothing except for test failures.")
parser.add_argument( parser.add_argument(
'--color', '--color',
choices=['never', 'always', 'auto'], choices=['never', 'always', 'auto'],