From ba8565fbcb975e2d067ce3ae5a7dbaae4953edd3 Mon Sep 17 00:00:00 2001 From: Madhur Amilkanthwar Date: Fri, 20 Oct 2023 17:23:34 +0530 Subject: [PATCH] [LIT] Print discovered tests and percentages (#66057) This patch adds "nice-to-have" feature in lit. it prints the total number of discovered tests at the beginning. It is covenient to see the total number of tests and avoid scrolling up to the beginning of log. Further, this patch also prints %ge of tests. Reviewed By: RoboTux, jdenny-ornl Co-authored-by: Madhur A --- llvm/utils/lit/lit/main.py | 8 +++++--- llvm/utils/lit/tests/discovery.py | 7 +++++++ 2 files changed, 12 insertions(+), 3 deletions(-) mode change 100644 => 100755 llvm/utils/lit/tests/discovery.py diff --git a/llvm/utils/lit/lit/main.py b/llvm/utils/lit/lit/main.py index 1d0d6bb268299..db9f24f748d9e 100755 --- a/llvm/utils/lit/lit/main.py +++ b/llvm/utils/lit/lit/main.py @@ -311,6 +311,7 @@ def print_histogram(tests): def print_results(tests, elapsed, opts): tests_by_code = {code: [] for code in lit.Test.ResultCode.all_codes()} + total_tests = len(tests) for test in tests: tests_by_code[test.result.code].append(test) @@ -321,7 +322,7 @@ def print_results(tests, elapsed, opts): opts.shown_codes, ) - print_summary(tests_by_code, opts.quiet, elapsed) + print_summary(total_tests, tests_by_code, opts.quiet, elapsed) def print_group(tests, code, shown_codes): @@ -336,10 +337,11 @@ def print_group(tests, code, shown_codes): sys.stdout.write("\n") -def print_summary(tests_by_code, quiet, elapsed): +def print_summary(total_tests, tests_by_code, quiet, elapsed): if not quiet: print("\nTesting Time: %.2fs" % elapsed) + print("\nTotal Discovered Tests: %s" % (total_tests)) codes = [c for c in lit.Test.ResultCode.all_codes() if not quiet or c.isFailure] groups = [(c.label, len(tests_by_code[c])) for c in codes] groups = [(label, count) for label, count in groups if count] @@ -352,4 +354,4 @@ def print_summary(tests_by_code, quiet, elapsed): for (label, count) in groups: label = label.ljust(max_label_len) count = str(count).rjust(max_count_len) - print(" %s: %s" % (label, count)) + print(" %s: %s (%.2f%%)" % (label, count, float(count) / total_tests * 100)) diff --git a/llvm/utils/lit/tests/discovery.py b/llvm/utils/lit/tests/discovery.py old mode 100644 new mode 100755 index 67f940f9251a0..60e7c8d6d688c --- a/llvm/utils/lit/tests/discovery.py +++ b/llvm/utils/lit/tests/discovery.py @@ -28,6 +28,13 @@ # CHECK-BASIC-OUT: top-level-suite :: test-one # CHECK-BASIC-OUT: top-level-suite :: test-two +# RUN: %{lit} %{inputs}/discovery \ +# RUN: -v > %t.out 2> %t.err +# RUN: FileCheck --check-prefix=CHECK-PERCENTAGES-OUT < %/t.out %s +# +# CHECK-PERCENTAGES-OUT: Total Discovered Tests: {{[0-9]*}} +# CHECK-PERCENTAGES-OUT: Passed: {{[0-9]*}} {{\([0-9]*\.[0-9]*%\)}} + # Check discovery when providing the special builtin 'config_map' # RUN: %{python} %{inputs}/config-map-discovery/driver.py \ # RUN: %{inputs}/config-map-discovery/main-config/lit.cfg \