Skip to content

Commit 9c350ee

Browse files
ZalatharZalathar
committed
Remove the -test suffix from normalize directives
1 parent 3dba041 commit 9c350ee

File tree

238 files changed

+442
-443
lines changed

Some content is hidden

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

238 files changed

+442
-443
lines changed

‎src/tools/compiletest/src/directive-list.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -160,10 +160,10 @@ const KNOWN_DIRECTIVE_NAMES: &[&str] = &[
160160
"needs-xray",
161161
"no-auto-check-cfg",
162162
"no-prefer-dynamic",
163+
"normalize-stderr",
163164
"normalize-stderr-32bit",
164165
"normalize-stderr-64bit",
165-
"normalize-stderr-test",
166-
"normalize-stdout-test",
166+
"normalize-stdout",
167167
"only-16bit",
168168
"only-32bit",
169169
"only-64bit",

‎src/tools/compiletest/src/header.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -982,8 +982,8 @@ impl Config {
982982
let directive_name = line.split_once(':')?.0;
983983

984984
let kind = match directive_name {
985-
"normalize-stdout-test" => NormalizeKind::Stdout,
986-
"normalize-stderr-test" => NormalizeKind::Stderr,
985+
"normalize-stdout" => NormalizeKind::Stdout,
986+
"normalize-stderr" => NormalizeKind::Stderr,
987987
"normalize-stderr-32bit" => NormalizeKind::Stderr32bit,
988988
"normalize-stderr-64bit" => NormalizeKind::Stderr64bit,
989989
_ => return None,

‎src/tools/tidy/src/style.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,7 @@ const ANNOTATIONS_TO_IGNORE: &[&str] = &[
6969
"// gdb",
7070
"// lldb",
7171
"// cdb",
72-
"// normalize-stderr-test",
73-
"//@ normalize-stderr-test",
72+
"//@ normalize-stderr",
7473
];
7574

7675
fn generate_problems<'a>(
@@ -198,8 +197,8 @@ fn should_ignore(line: &str) -> bool {
198197

199198
// For `ui_test`-style UI test directives, also ignore
200199
// - `//@[rev] compile-flags`
201-
// - `//@[rev] normalize-stderr-test`
202-
|| static_regex!("\\s*//@(\\[.*\\]) (compile-flags|normalize-stderr-test|error-pattern).*")
200+
// - `//@[rev] normalize-stderr`
201+
|| static_regex!("\\s*//@(\\[.*\\]) (compile-flags|normalize-stderr|error-pattern).*")
203202
.is_match(line)
204203
// Matching for rustdoc tests commands.
205204
// It allows to prevent them emitting warnings like `line longer than 100 chars`.

‎tests/rustdoc-ui/2024-doctests-checks.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
//@ check-pass
22
//@ edition: 2024
33
//@ compile-flags: --test --test-args=--test-threads=1
4-
//@ normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
5-
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
6-
//@ normalize-stdout-test: ".rs:\d+:\d+" -> ".rs:$$LINE:$$COL"
4+
//@ normalize-stdout: "tests/rustdoc-ui" -> "$$DIR"
5+
//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
6+
//@ normalize-stdout: ".rs:\d+:\d+" -> ".rs:$$LINE:$$COL"
77

88
/// ```
99
/// let x = 12;

‎tests/rustdoc-ui/2024-doctests-crate-attribute.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
//@ check-pass
22
//@ edition: 2024
33
//@ compile-flags: --test --test-args=--test-threads=1
4-
//@ normalize-stdout-test: "tests/rustdoc-ui" -> "$$DIR"
5-
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
6-
//@ normalize-stdout-test: ".rs:\d+:\d+" -> ".rs:$$LINE:$$COL"
4+
//@ normalize-stdout: "tests/rustdoc-ui" -> "$$DIR"
5+
//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
6+
//@ normalize-stdout: ".rs:\d+:\d+" -> ".rs:$$LINE:$$COL"
77

88
/// This doctest is used to ensure that if a crate attribute is present,
99
/// it will not be part of the merged doctests.

‎tests/rustdoc-ui/argfile/commandline-argfile-missing-windows.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
// line arguments and is only run on windows.
66
//
77
//@ only-windows
8-
//@ normalize-stderr-test: "os error \d+" -> "os error $$ERR"
9-
//@ normalize-stderr-test: "commandline-argfile-missing.args:[^(]*" -> "commandline-argfile-missing.args: $$FILE_MISSING "
8+
//@ normalize-stderr: "os error \d+" -> "os error $$ERR"
9+
//@ normalize-stderr: "commandline-argfile-missing.args:[^(]*" -> "commandline-argfile-missing.args: $$FILE_MISSING "
1010
//@ compile-flags: --cfg cmdline_set @{{src-base}}\argfile\commandline-argfile-missing.args
1111

1212
#[cfg(not(cmdline_set))]

‎tests/rustdoc-ui/argfile/commandline-argfile-missing.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
// windows.
77
//
88
//@ ignore-windows
9-
//@ normalize-stderr-test: "os error \d+" -> "os error $$ERR"
10-
//@ normalize-stderr-test: "commandline-argfile-missing.args:[^(]*" -> "commandline-argfile-missing.args: $$FILE_MISSING "
9+
//@ normalize-stderr: "os error \d+" -> "os error $$ERR"
10+
//@ normalize-stderr: "commandline-argfile-missing.args:[^(]*" -> "commandline-argfile-missing.args: $$FILE_MISSING "
1111
//@ compile-flags: --cfg cmdline_set @{{src-base}}/argfile/commandline-argfile-missing.args
1212

1313
#[cfg(not(cmdline_set))]

‎tests/rustdoc-ui/argfile/commandline-argfile-multiple-windows.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
// line arguments and is only run on windows.
66
//
77
//@ only-windows
8-
//@ normalize-stderr-test: "os error \d+" -> "os error $$ERR"
9-
//@ normalize-stderr-test: "commandline-argfile-missing.args:[^(]*" -> "commandline-argfile-missing.args: $$FILE_MISSING "
10-
//@ normalize-stderr-test: "commandline-argfile-missing2.args:[^(]*" -> "commandline-argfile-missing2.args: $$FILE_MISSING "
8+
//@ normalize-stderr: "os error \d+" -> "os error $$ERR"
9+
//@ normalize-stderr: "commandline-argfile-missing.args:[^(]*" -> "commandline-argfile-missing.args: $$FILE_MISSING "
10+
//@ normalize-stderr: "commandline-argfile-missing2.args:[^(]*" -> "commandline-argfile-missing2.args: $$FILE_MISSING "
1111
//@ compile-flags: --cfg cmdline_set @{{src-base}}\argfile\commandline-argfile-missing.args @{{src-base}}\argfile\commandline-argfile-badutf8.args @{{src-base}}\argfile\commandline-argfile-missing2.args
1212

1313
#[cfg(not(cmdline_set))]

‎tests/rustdoc-ui/argfile/commandline-argfile-multiple.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
// windows.
77
//
88
//@ ignore-windows
9-
//@ normalize-stderr-test: "os error \d+" -> "os error $$ERR"
10-
//@ normalize-stderr-test: "commandline-argfile-missing.args:[^(]*" -> "commandline-argfile-missing.args: $$FILE_MISSING "
11-
//@ normalize-stderr-test: "commandline-argfile-missing2.args:[^(]*" -> "commandline-argfile-missing2.args: $$FILE_MISSING "
9+
//@ normalize-stderr: "os error \d+" -> "os error $$ERR"
10+
//@ normalize-stderr: "commandline-argfile-missing.args:[^(]*" -> "commandline-argfile-missing.args: $$FILE_MISSING "
11+
//@ normalize-stderr: "commandline-argfile-missing2.args:[^(]*" -> "commandline-argfile-missing2.args: $$FILE_MISSING "
1212
//@ compile-flags: --cfg cmdline_set @{{src-base}}/argfile/commandline-argfile-missing.args @{{src-base}}/argfile/commandline-argfile-badutf8.args @{{src-base}}/argfile/commandline-argfile-missing2.args
1313

1414
#[cfg(not(cmdline_set))]

‎tests/rustdoc-ui/disambiguator-endswith-named-suffix.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//@ check-pass
2-
//@ normalize-stderr-test: "nightly|beta|1\.[0-9][0-9]\.[0-9]" -> "$$CHANNEL"
2+
//@ normalize-stderr: "nightly|beta|1\.[0-9][0-9]\.[0-9]" -> "$$CHANNEL"
33

44
//! [struct@m!()] //~ WARN: unmatched disambiguator `struct` and suffix `!()`
55
//! [struct@m!{}]

‎tests/rustdoc-ui/doctest/block-doc-comment.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//@ check-pass
22
//@ compile-flags:--test
3-
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
3+
//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
44

55
// This test ensures that no code block is detected in the doc comments.
66

‎tests/rustdoc-ui/doctest/cfg-test.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//@ check-pass
22
//@ compile-flags:--test --test-args --test-threads=1
3-
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
4-
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
3+
//@ normalize-stdout: "tests/rustdoc-ui/doctest" -> "$$DIR"
4+
//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
55

66
// Crates like core have doctests gated on `cfg(not(test))` so we need to make
77
// sure `cfg(test)` is not active when running `rustdoc --test`.

‎tests/rustdoc-ui/doctest/check-cfg-test.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
//@ check-pass
22
//@ compile-flags: --test --nocapture --check-cfg=cfg(feature,values("test")) -Z unstable-options
3-
//@ normalize-stderr-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
4-
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
5-
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
3+
//@ normalize-stderr: "tests/rustdoc-ui/doctest" -> "$$DIR"
4+
//@ normalize-stdout: "tests/rustdoc-ui/doctest" -> "$$DIR"
5+
//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
66

77
/// The doctest will produce a warning because feature invalid is unexpected
88
/// ```

‎tests/rustdoc-ui/doctest/comment-in-attr-134221-2.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
//@ compile-flags:--test --test-args --test-threads=1
22
//@ failure-status: 101
3-
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
4-
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
5-
//@ normalize-stdout-test: ".rs:\d+:\d+" -> ".rs:$$LINE:$$COL"
3+
//@ normalize-stdout: "tests/rustdoc-ui/doctest" -> "$$DIR"
4+
//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
5+
//@ normalize-stdout: ".rs:\d+:\d+" -> ".rs:$$LINE:$$COL"
66

77
//! ```
88
#![doc = "#![all\

‎tests/rustdoc-ui/doctest/comment-in-attr-134221.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
//@ compile-flags:--test --test-args --test-threads=1
66
//@ failure-status: 101
7-
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
8-
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
9-
//@ normalize-stdout-test: ".rs:\d+:\d+" -> ".rs:$$LINE:$$COL"
7+
//@ normalize-stdout: "tests/rustdoc-ui/doctest" -> "$$DIR"
8+
//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
9+
//@ normalize-stdout: ".rs:\d+:\d+" -> ".rs:$$LINE:$$COL"
1010

1111
/*!
1212
```rust

‎tests/rustdoc-ui/doctest/dead-code-2024.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
//@ edition: 2024
44
//@ compile-flags:--test
5-
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
6-
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
5+
//@ normalize-stdout: "tests/rustdoc-ui/doctest" -> "$$DIR"
6+
//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
77
//@ failure-status: 101
88

99
#![doc(test(attr(allow(unused_variables), deny(warnings))))]

‎tests/rustdoc-ui/doctest/dead-code.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// This test ensures that the doctest will not use `#[allow(unused)]`.
22

33
//@ compile-flags:--test
4-
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
5-
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
4+
//@ normalize-stdout: "tests/rustdoc-ui/doctest" -> "$$DIR"
5+
//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
66
//@ failure-status: 101
77

88
#![doc(test(attr(allow(unused_variables), deny(warnings))))]

‎tests/rustdoc-ui/doctest/display-output.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
//@ check-pass
44
//@ edition:2018
55
//@ compile-flags:--test --test-args=--show-output
6-
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
7-
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
6+
//@ normalize-stdout: "tests/rustdoc-ui/doctest" -> "$$DIR"
7+
//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
88

99
/// ```
1010
/// #![warn(unused)]

‎tests/rustdoc-ui/doctest/doc-comment-multi-line-attr.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Regression test for #97440: Multiline inner attribute triggers ICE during doctest
22
//@ compile-flags:--test
3-
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
4-
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
3+
//@ normalize-stdout: "tests/rustdoc-ui/doctest" -> "$$DIR"
4+
//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
55
//@ check-pass
66

77
//! ```rust

‎tests/rustdoc-ui/doctest/doc-comment-multi-line-cfg-attr.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//@ compile-flags:--test
2-
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
3-
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
2+
//@ normalize-stdout: "tests/rustdoc-ui/doctest" -> "$$DIR"
3+
//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
44
//@ check-pass
55

66
/// ```

‎tests/rustdoc-ui/doctest/doc-test-doctest-feature.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//@ check-pass
22
//@ compile-flags:--test
3-
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
4-
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
3+
//@ normalize-stdout: "tests/rustdoc-ui/doctest" -> "$$DIR"
4+
//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
55

66
// Make sure `cfg(doctest)` is set when finding doctests but not inside
77
// the doctests.

‎tests/rustdoc-ui/doctest/doc-test-rustdoc-feature.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//@ check-pass
22
//@ compile-flags:--test
3-
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
4-
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
3+
//@ normalize-stdout: "tests/rustdoc-ui/doctest" -> "$$DIR"
4+
//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
55

66
#![feature(doc_cfg)]
77

‎tests/rustdoc-ui/doctest/doctest-multiline-crate-attribute.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//@ compile-flags:--test --test-args=--test-threads=1
2-
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
3-
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
2+
//@ normalize-stdout: "tests/rustdoc-ui/doctest" -> "$$DIR"
3+
//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
44
//@ check-pass
55

66
/// ```

‎tests/rustdoc-ui/doctest/doctest-output-include-fail.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//@ edition:2024
22
//@ compile-flags:--test --test-args=--test-threads=1
3-
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
4-
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
3+
//@ normalize-stdout: "tests/rustdoc-ui/doctest" -> "$$DIR"
4+
//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
55
//@ failure-status: 101
66

77
// https://github.com/rust-lang/rust/issues/130470

‎tests/rustdoc-ui/doctest/doctest-output.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
//@[edition2024]edition:2015
66
//@[edition2024]aux-build:extern_macros.rs
77
//@[edition2024]compile-flags:--test --test-args=--test-threads=1
8-
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
9-
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
8+
//@ normalize-stdout: "tests/rustdoc-ui/doctest" -> "$$DIR"
9+
//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
1010
//@ check-pass
1111

1212
//! ```

‎tests/rustdoc-ui/doctest/failed-doctest-compile-fail.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// adapted to use that, and that normalize line can go away
33

44
//@ compile-flags:--test
5-
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
6-
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
5+
//@ normalize-stdout: "tests/rustdoc-ui/doctest" -> "$$DIR"
6+
//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
77
//@ failure-status: 101
88

99
/// ```compile_fail

‎tests/rustdoc-ui/doctest/failed-doctest-extra-semicolon-on-item.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// adapted to use that, and that normalize line can go away
33

44
//@ compile-flags:--test
5-
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
6-
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
5+
//@ normalize-stdout: "tests/rustdoc-ui/doctest" -> "$$DIR"
6+
//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
77
//@ failure-status: 101
88

99
/// <https://github.com/rust-lang/rust/issues/91014>

‎tests/rustdoc-ui/doctest/failed-doctest-missing-codes.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// adapted to use that, and that normalize line can go away
33

44
//@ compile-flags:--test
5-
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
6-
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
5+
//@ normalize-stdout: "tests/rustdoc-ui/doctest" -> "$$DIR"
6+
//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
77
//@ failure-status: 101
88

99
/// ```compile_fail,E0004

‎tests/rustdoc-ui/doctest/failed-doctest-output-windows.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
//@ compile-flags:--test --test-args --test-threads=1
99
//@ rustc-env:RUST_BACKTRACE=0
10-
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
11-
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
10+
//@ normalize-stdout: "tests/rustdoc-ui/doctest" -> "$$DIR"
11+
//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
1212
//@ failure-status: 101
1313

1414
// doctest fails at runtime

‎tests/rustdoc-ui/doctest/failed-doctest-output.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
//@ compile-flags:--test --test-args --test-threads=1
99
//@ rustc-env:RUST_BACKTRACE=0
10-
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
11-
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
10+
//@ normalize-stdout: "tests/rustdoc-ui/doctest" -> "$$DIR"
11+
//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
1212
//@ failure-status: 101
1313

1414
// doctest fails at runtime

‎tests/rustdoc-ui/doctest/failed-doctest-should-panic-2021.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// adapted to use that, and that normalize line can go away
33

44
//@ compile-flags:--test --edition 2021
5-
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
6-
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
5+
//@ normalize-stdout: "tests/rustdoc-ui/doctest" -> "$$DIR"
6+
//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
77
//@ failure-status: 101
88

99
/// ```should_panic

‎tests/rustdoc-ui/doctest/failed-doctest-should-panic.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
//@ edition: 2024
55
//@ compile-flags:--test
6-
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
7-
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
6+
//@ normalize-stdout: "tests/rustdoc-ui/doctest" -> "$$DIR"
7+
//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
88
//@ failure-status: 101
99

1010
/// ```should_panic

‎tests/rustdoc-ui/doctest/merged-ignore-no_run.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//@ edition: 2024
22
//@ compile-flags:--test --test-args=--test-threads=1
3-
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
4-
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
3+
//@ normalize-stdout: "tests/rustdoc-ui/doctest" -> "$$DIR"
4+
//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
55
//@ check-pass
66

77
/// ```ignore (test)

‎tests/rustdoc-ui/doctest/nested-main.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//@ check-pass
22
//@ compile-flags:--test --test-args=--test-threads=1
3-
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
4-
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
3+
//@ normalize-stdout: "tests/rustdoc-ui/doctest" -> "$$DIR"
4+
//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
55

66
// Regression test for <https://github.com/rust-lang/rust/issues/131893>.
77
// It ensures that if a function called `main` is nested, it will not consider

‎tests/rustdoc-ui/doctest/no-run-flag.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
//@ check-pass
44
//@ compile-flags:-Z unstable-options --test --no-run --test-args=--test-threads=1
5-
//@ normalize-stdout-test: "tests/rustdoc-ui/doctest" -> "$$DIR"
6-
//@ normalize-stdout-test: "finished in \d+\.\d+s" -> "finished in $$TIME"
5+
//@ normalize-stdout: "tests/rustdoc-ui/doctest" -> "$$DIR"
6+
//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
77

88
/// ```
99
/// let a = true;

0 commit comments

Comments
 (0)