Skip to content

Commit 2634bc7

Browse files
committed
[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. This patch fixes tests pointed by previous attempt of landing this patch. Reviewed By: RoboTux, jdenny-ornl Co-authored-by: Madhur A <[email protected]>
1 parent 764c7ae commit 2634bc7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+78
-65
lines changed

llvm/utils/lit/lit/main.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,7 @@ def print_histogram(tests):
311311

312312
def print_results(tests, elapsed, opts):
313313
tests_by_code = {code: [] for code in lit.Test.ResultCode.all_codes()}
314+
total_tests = len(tests)
314315
for test in tests:
315316
tests_by_code[test.result.code].append(test)
316317

@@ -321,7 +322,7 @@ def print_results(tests, elapsed, opts):
321322
opts.shown_codes,
322323
)
323324

324-
print_summary(tests_by_code, opts.quiet, elapsed)
325+
print_summary(total_tests, tests_by_code, opts.quiet, elapsed)
325326

326327

327328
def print_group(tests, code, shown_codes):
@@ -336,10 +337,11 @@ def print_group(tests, code, shown_codes):
336337
sys.stdout.write("\n")
337338

338339

339-
def print_summary(tests_by_code, quiet, elapsed):
340+
def print_summary(total_tests, tests_by_code, quiet, elapsed):
340341
if not quiet:
341342
print("\nTesting Time: %.2fs" % elapsed)
342343

344+
print("\nTotal Discovered Tests: %s" % (total_tests))
343345
codes = [c for c in lit.Test.ResultCode.all_codes() if not quiet or c.isFailure]
344346
groups = [(c.label, len(tests_by_code[c])) for c in codes]
345347
groups = [(label, count) for label, count in groups if count]
@@ -352,4 +354,4 @@ def print_summary(tests_by_code, quiet, elapsed):
352354
for (label, count) in groups:
353355
label = label.ljust(max_label_len)
354356
count = str(count).rjust(max_count_len)
355-
print(" %s: %s" % (label, count))
357+
print(" %s: %s (%.2f%%)" % (label, count, float(count) / total_tests * 100))

llvm/utils/lit/tests/Inputs/shtest-define/errors/assignment/before-name.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
# CHECK: Substitution name 'foo %{name}' is malformed {{.*}}
55
# CHECK-NEXT: in {{DEFINE}}: directive on test line [[#@LINE-4]]
66

7-
# CHECK: Unresolved: 1
7+
# CHECK: Unresolved: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/errors/assignment/between-name-equals.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
# CHECK: Substitution name '%{name}:' is malformed {{.*}}
77
# CHECK-NEXT: in {{DEFINE}}: directive on test line [[#@LINE-4]]
88

9-
# CHECK: Unresolved: 1
9+
# CHECK: Unresolved: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/errors/assignment/braces-empty.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
# CHECK: Substitution name '%{}' is malformed {{.*}}
55
# CHECK-NEXT: in {{DEFINE}}: directive on test line [[#@LINE-4]]
66

7-
# CHECK: Unresolved: 1
7+
# CHECK: Unresolved: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/errors/assignment/braces-with-dot.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
# CHECK: Substitution name '%{foo.bar}' is malformed {{.*}}
1010
# CHECK-NEXT: in {{DEFINE}}: directive on test line [[#@LINE-4]]
1111

12-
# CHECK: Unresolved: 1
12+
# CHECK: Unresolved: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/errors/assignment/braces-with-equals.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
# CHECK: Substitution name '%{foo' is malformed {{.*}}
77
# CHECK-NEXT: in {{DEFINE}}: directive on test line [[#@LINE-4]]
88

9-
# CHECK: Unresolved: 1
9+
# CHECK: Unresolved: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/errors/assignment/braces-with-newline.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
# CHECK: Substitution name '%{foo bar}' is malformed {{.*}}
66
# CHECK-NEXT: in {{DEFINE}}: directive on test line [[#@LINE-4]]
77

8-
# CHECK: Unresolved: 1
8+
# CHECK: Unresolved: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/errors/assignment/braces-with-number.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
# CHECK: Substitution name '%{3}' is malformed {{.*}}
1010
# CHECK-NEXT: in {{DEFINE}}: directive on test line [[#@LINE-4]]
1111

12-
# CHECK: Unresolved: 1
12+
# CHECK: Unresolved: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/errors/assignment/braces-with-ws.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
# CHECK: Substitution name '%{foo bar}' is malformed {{.*}}
55
# CHECK-NEXT: in {{DEFINE}}: directive on test line [[#@LINE-4]]
66

7-
# CHECK: Unresolved: 1
7+
# CHECK: Unresolved: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/errors/assignment/empty.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
# CHECK: Substitution's definition does not contain '='
55
# CHECK-NEXT: in {{DEFINE}}: directive on test line [[#@LINE-4]]
66

7-
# CHECK: Unresolved: 1
7+
# CHECK: Unresolved: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/errors/assignment/no-equals.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
# CHECK: Substitution's definition does not contain '='
55
# CHECK-NEXT: in {{DEFINE}}: directive on test line [[#@LINE-4]]
66

7-
# CHECK: Unresolved: 1
7+
# CHECK: Unresolved: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/errors/assignment/no-name.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
# CHECK: Substitution name '' is malformed {{.*}}
55
# CHECK-NEXT: in {{DEFINE}}: directive on test line [[#@LINE-4]]
66

7-
# CHECK: Unresolved: 1
7+
# CHECK: Unresolved: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/errors/assignment/ws-only.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
# CHECK: Substitution's definition does not contain '='
66
# CHECK-NEXT: in {{DEFINE}}: directive on test line [[#@LINE-4]]
77

8-
# CHECK: Unresolved: 1
8+
# CHECK: Unresolved: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/errors/continuation/empty.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
# CHECK: Substitution's continuation is empty
88
# CHECK-NEXT: in DEFINE: directive on test line [[#@LINE-4]]
99

10-
# CHECK: Unresolved: 1
10+
# CHECK: Unresolved: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/errors/continuation/end-in-double-backslash.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
# CHECK: Substitution's continuation is empty
99
# CHECK-NEXT: in {{DEFINE}}: directive on test line [[#@LINE-4]]
1010

11-
# CHECK: Unresolved: 1
11+
# CHECK: Unresolved: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/errors/continuation/unterminated-define-bad-redefine.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@
1010
# CHECK: Substitution's definition does not contain '='
1111
# CHECK-NEXT: in {{REDEFINE}}: directive on test line [[#@LINE-5]]
1212

13-
# CHECK: Unresolved: 1
13+
# CHECK: Unresolved: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/errors/continuation/unterminated-define-continuation.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66

77
# CHECK: Test has unterminated '{{DEFINE}}:' directive (with '\') from line [[#@LINE-3]] to [[#@LINE-2]]
88

9-
# CHECK: Unresolved: 1
9+
# CHECK: Unresolved: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/errors/continuation/unterminated-define-redefine.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@
1010

1111
# CHECK: Test has unterminated '{{DEFINE}}:' directive (with '\') at line [[#@LINE-5]]
1212

13-
# CHECK: Unresolved: 1
13+
# CHECK: Unresolved: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/errors/continuation/unterminated-define-run.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66

77
# CHECK: Test has unterminated '{{DEFINE}}:' directive (with '\') at line [[#@LINE-4]]
88

9-
# CHECK: Unresolved: 1
9+
# CHECK: Unresolved: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/errors/continuation/unterminated-define.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55

66
# CHECK: Test has unterminated '{{DEFINE}}:' directive (with '\') at line [[#@LINE-2]]
77

8-
# CHECK: Unresolved: 1
8+
# CHECK: Unresolved: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/errors/continuation/unterminated-redefine-bad-define.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@
1010
# CHECK: Substitution's definition does not contain '='
1111
# CHECK-NEXT: in {{DEFINE}}: directive on test line [[#@LINE-5]]
1212

13-
# CHECK: Unresolved: 1
13+
# CHECK: Unresolved: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/errors/continuation/unterminated-redefine-continuation.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66

77
# CHECK: Test has unterminated '{{REDEFINE}}:' directive (with '\') from line [[#@LINE-3]] to [[#@LINE-2]]
88

9-
# CHECK: Unresolved: 1
9+
# CHECK: Unresolved: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/errors/continuation/unterminated-redefine-define.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@
1010

1111
# CHECK: Test has unterminated '{{REDEFINE}}:' directive (with '\') at line [[#@LINE-5]]
1212

13-
# CHECK: Unresolved: 1
13+
# CHECK: Unresolved: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/errors/continuation/unterminated-redefine-run.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66

77
# CHECK: Test has unterminated '{{REDEFINE}}:' directive (with '\') at line [[#@LINE-4]]
88

9-
# CHECK: Unresolved: 1
9+
# CHECK: Unresolved: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/errors/continuation/unterminated-redefine.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55

66
# CHECK: Test has unterminated '{{REDEFINE}}:' directive (with '\') at line [[#@LINE-2]]
77

8-
# CHECK: Unresolved: 1
8+
# CHECK: Unresolved: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/errors/continuation/unterminated-run-define.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66

77
# CHECK: Test has unterminated '{{RUN}}:' directive (with '\') at line [[#@LINE-4]]
88

9-
# CHECK: Unresolved: 1
9+
# CHECK: Unresolved: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/errors/continuation/unterminated-run-redefine.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66

77
# CHECK: Test has unterminated '{{RUN}}:' directive (with '\') at line [[#@LINE-4]]
88

9-
# CHECK: Unresolved: 1
9+
# CHECK: Unresolved: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/errors/continuation/ws-only.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
# CHECK: Substitution's continuation is empty
99
# CHECK-NEXT: in {{DEFINE}}: directive on test line [[#@LINE-5]]
1010

11-
# CHECK: Unresolved: 1
11+
# CHECK: Unresolved: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/errors/defined-check/define-already-by-config.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
# CHECK-NEXT: Existing pattern: %{global:greeting}
66
# CHECK-NOT: Existing pattern:
77

8-
# CHECK: Unresolved: 1
8+
# CHECK: Unresolved: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/errors/defined-check/define-already-by-test.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
# CHECK-NEXT: Existing pattern: %{foo}
88
# CHECK-NOT: Existing pattern:
99

10-
# CHECK: Unresolved: 1
10+
# CHECK: Unresolved: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/errors/defined-check/define-inside-pattern.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
# CHECK-NEXT: Existing pattern: <%{global:inside}>
66
# CHECK-NOT: Existing pattern:
77

8-
# CHECK: Unresolved: 1
8+
# CHECK: Unresolved: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/errors/defined-check/define-multiple-exact.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
# CHECK-NEXT: Existing pattern: %{global:multiple-exact}
77
# CHECK-NOT: Existing pattern:
88

9-
# CHECK: Unresolved: 1
9+
# CHECK: Unresolved: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/errors/defined-check/define-multiple-once-exact.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
# CHECK-NEXT: Existing pattern: %{global:multiple-once-exact}
77
# CHECK-NOT: Existing pattern:
88

9-
# CHECK: Unresolved: 1
9+
# CHECK: Unresolved: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/errors/defined-check/define-prefixes-pattern.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
# CHECK-NEXT: Existing pattern: %{global:prefix}\((.*)\)
66
# CHECK-NOT: Existing pattern:
77

8-
# CHECK: Unresolved: 1
8+
# CHECK: Unresolved: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/errors/defined-check/define-suffixes-pattern.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
# CHECK-NEXT: Existing pattern: @%{global:suffix}
66
# CHECK-NOT: Existing pattern:
77

8-
# CHECK: Unresolved: 1
8+
# CHECK: Unresolved: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/errors/defined-check/redefine-inside-pattern.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
# CHECK-NEXT: Existing pattern: <%{global:inside}>
77
# CHECK-NOT: Existing pattern:
88

9-
# CHECK: Unresolved: 1
9+
# CHECK: Unresolved: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/errors/defined-check/redefine-multiple-exact.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@
1010
# CHECK-NEXT: Existing pattern: %{global:multiple-exact}
1111
# CHECK-NOT: Existing pattern:
1212

13-
# CHECK: Unresolved: 1
13+
# CHECK: Unresolved: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/errors/defined-check/redefine-multiple-once-exact.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
# CHECK-NEXT: Existing pattern: %{global:multiple-once-exact}
1010
# CHECK-NOT: Existing pattern:
1111

12-
# CHECK: Unresolved: 1
12+
# CHECK: Unresolved: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/errors/defined-check/redefine-none.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
# CHECK: ValueError: No substitution for '%{local}' is defined before '{{REDEFINE}}:' directive at line [[#@LINE-3]]
55
# CHECK-NOT: Existing pattern:
66

7-
# CHECK: Unresolved: 1
7+
# CHECK: Unresolved: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/errors/defined-check/redefine-prefixes-pattern.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
# CHECK-NEXT: Existing pattern: %{global:prefix}\((.*)\)
77
# CHECK-NOT: Existing pattern:
88

9-
# CHECK: Unresolved: 1
9+
# CHECK: Unresolved: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/errors/defined-check/redefine-suffixes-pattern.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
# CHECK-NEXT: Existing pattern: @%{global:suffix}
77
# CHECK-NOT: Existing pattern:
88

9-
# CHECK: Unresolved: 1
9+
# CHECK: Unresolved: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/errors/location-range.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55

66
# CHECK: ValueError: Substitution whose pattern contains '%{foo}' is already defined before '{{DEFINE}}:' directive from line [[#@LINE-4]] to [[#@LINE-3]]
77

8-
# CHECK: Unresolved: 1
8+
# CHECK: Unresolved: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/errors/no-run.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55

66
# CHECK: Test has no '{{RUN}}:' line
77

8-
# CHECK: Unresolved: 1
8+
# CHECK: Unresolved: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/examples/param-subst.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@
3131
; RUN: %{check}
3232
; CHECK:# | %clang_cc1 -verify -fopenmp -fopenmp-version=51 -triple x86_64-unknown-linux-gnu -emit-llvm -o - {{.*}} | FileCheck -check-prefix=NO-SIMD {{.*}}
3333

34-
; CHECK: Passed: 1
34+
; CHECK: Passed: 1 {{\([0-9]*\.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/expansion-order.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@
3838
# RUN: %{local:echo}
3939
# CHECK:# | LOCAL: So Long World World
4040

41-
# CHECK: Passed: 1
41+
# CHECK: Passed: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/line-number-substitutions.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@
2929
# RUN: echo '%{lines-rel}'
3030
# CHECK:# | [[#@LINE+1]], [[#@LINE-3]], [[#@LINE-12]]
3131

32-
# CHECK: Passed: 1
32+
# CHECK: Passed: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/name-chars.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222
# RUN: echo '%{_foo_bar_}'
2323
# CHECK:# | ok at [[#@LINE - 2]]
2424

25-
# CHECK: Passed: 1
25+
# CHECK: Passed: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/recursiveExpansionLimit.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
# CHECK-NON-RECUR:# | %{inner}
1010
# CHECK-RECUR:# | expanded
1111

12-
# CHECK: Passed: 1
12+
# CHECK: Passed: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/shared-substs-0.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@
1919
# DEFINE: %{local:echo}=echo LOCAL0: subst
2020
# RUN: %{local:echo}
2121

22-
# CHECK: Passed: 1
22+
# CHECK: Passed: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/shared-substs-1.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@
1919
# DEFINE: %{local:echo}=echo LOCAL1: subst
2020
# RUN: %{local:echo}
2121

22-
# CHECK: Passed: 1
22+
# CHECK: Passed: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/value-equals.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@
1919
# RUN: echo '%{continue-equals}'
2020
# CHECK:# | FileCheck -input-file=test.txt -implicit-check-not=foobar -check-prefixes=FOO,BAR
2121

22-
# CHECK: Passed: 1
22+
# CHECK: Passed: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/value-escaped.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
# RUN: echo '%{escape}'
1414
# CHECK:# | {{\\?}}\n {{\\?}}\g<param>
1515

16-
# CHECK: Passed: 1
16+
# CHECK: Passed: 1 {{\([0-9]*.[0-9]*%\)}}

llvm/utils/lit/tests/Inputs/shtest-define/ws-and-continuations.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,4 +132,4 @@
132132
# RUN: %{deceptive-continue}
133133
# CHECK:# | x=3
134134

135-
# CHECK:{{ *}}Passed: 1
135+
# CHECK:{{ *}}Passed: 1 {{\([0-9]*\.[0-9]*%\)}}

llvm/utils/lit/tests/discovery.py

100644100755
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,13 @@
2828
# CHECK-BASIC-OUT: top-level-suite :: test-one
2929
# CHECK-BASIC-OUT: top-level-suite :: test-two
3030

31+
# RUN: %{lit} %{inputs}/discovery \
32+
# RUN: -v > %t.out 2> %t.err
33+
# RUN: FileCheck --check-prefix=CHECK-PERCENTAGES-OUT < %/t.out %s
34+
#
35+
# CHECK-PERCENTAGES-OUT: Total Discovered Tests: {{[0-9]*}}
36+
# CHECK-PERCENTAGES-OUT: Passed: {{[0-9]*}} {{\([0-9]*\.[0-9]*%\)}}
37+
3138
# Check discovery when providing the special builtin 'config_map'
3239
# RUN: %{python} %{inputs}/config-map-discovery/driver.py \
3340
# RUN: %{inputs}/config-map-discovery/main-config/lit.cfg \

llvm/utils/lit/tests/ignore-fail.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@
1212
# CHECK-DAG: XPASS: ignore-fail :: xpass.txt
1313

1414
# CHECK: Testing Time:
15-
# CHECK-NEXT: Expectedly Failed : 1
16-
# CHECK-NEXT: Unresolved : 1
17-
# CHECK-NEXT: Failed : 1
18-
# CHECK-NEXT: Unexpectedly Passed: 1
15+
# CHECK: Total Discovered Tests:
16+
# CHECK-NEXT: Expectedly Failed : 1 {{\([0-9]*\.[0-9]*%\)}}
17+
# CHECK-NEXT: Unresolved : 1 {{\([0-9]*\.[0-9]*%\)}}
18+
# CHECK-NEXT: Failed : 1 {{\([0-9]*\.[0-9]*%\)}}
19+
# CHECK-NEXT: Unexpectedly Passed: 1 {{\([0-9]*\.[0-9]*%\)}}
1920
# CHECK-NOT: {{.}}

llvm/utils/lit/tests/shtest-env.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@
120120
# CHECK-NOT: {{^[^#]}}
121121
# CHECK: --
122122

123-
# CHECK: Passed: 4
124-
# CHECK: Failed: 12
123+
# CHECK: Total Discovered Tests: 16
124+
# CHECK: Passed: 4 {{\([0-9]*\.[0-9]*%\)}}
125+
# CHECK: Failed: 12 {{\([0-9]*\.[0-9]*%\)}}
125126
# CHECK-NOT: {{.}}

llvm/utils/lit/tests/shtest-not.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@
184184
# CHECK: # | Error: 'not --crash' cannot call 'rm'
185185
# CHECK: # error: command failed with exit status: {{.*}}
186186

187-
# CHECK: Passed: 1
188-
# CHECK: Failed: 16
187+
# CHECK: Total Discovered Tests: 17
188+
# CHECK: Passed: 1 {{\([0-9]*\.[0-9]*%\)}}
189+
# CHECK: Failed: 16 {{\([0-9]*\.[0-9]*%\)}}
189190
# CHECK-NOT: {{.}}

0 commit comments

Comments
 (0)