Skip to content

Commit 46993ef

Browse files
committed
libtest: Normalize test suite execution time output of ui tests
1 parent 0487efd commit 46993ef

File tree

5 files changed

+6
-4
lines changed

5 files changed

+6
-4
lines changed

src/test/ui/test-thread-capture.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// run-flags: --test-threads=1
44
// check-run-results
55
// exec-env:RUST_BACKTRACE=0
6+
// normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
67
// ignore-emscripten no threads support
78

89
#[test]

src/test/ui/test-thread-capture.run.stdout

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ fee
1010
fie
1111
foe
1212
fum
13-
thread 'main' panicked at 'explicit panic', $DIR/test-thread-capture.rs:30:5
13+
thread 'main' panicked at 'explicit panic', $DIR/test-thread-capture.rs:31:5
1414
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
1515

1616

1717
failures:
1818
thready_fail
1919

20-
test result: FAILED. 1 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out
20+
test result: FAILED. 1 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
2121

src/test/ui/test-thread-nocapture.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// run-flags: --test-threads=1 --nocapture
44
// check-run-results
55
// exec-env:RUST_BACKTRACE=0
6+
// normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
67
// ignore-emscripten no threads support
78

89
#[test]
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
thread 'main' panicked at 'explicit panic', $DIR/test-thread-nocapture.rs:30:5
1+
thread 'main' panicked at 'explicit panic', $DIR/test-thread-nocapture.rs:31:5
22
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

src/test/ui/test-thread-nocapture.run.stdout

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ failures:
1616
failures:
1717
thready_fail
1818

19-
test result: FAILED. 1 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out
19+
test result: FAILED. 1 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
2020

0 commit comments

Comments
 (0)