Skip to content

Commit 950c415

Browse files
committed
Fully match stderr, return if not nightly, shorten file
1 parent 9e4c0e1 commit 950c415

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

tests/testsuite/doc.rs

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1171,7 +1171,10 @@ fn doc_workspace_open_help_message() {
11711171
#[cargo_test]
11721172
#[cfg(not(windows))] // `echo` may not be available
11731173
fn doc_extern_map_local() {
1174-
assert!(is_nightly());
1174+
if !is_nightly() {
1175+
// -Zextern-html-root-url is unstable
1176+
return;
1177+
}
11751178

11761179
let p = project()
11771180
.file(
@@ -1183,21 +1186,20 @@ fn doc_extern_map_local() {
11831186
"#,
11841187
)
11851188
.file("src/lib.rs", "")
1189+
.file(".cargo/config.toml", "doc.extern-map.std = 'local'")
11861190
.build();
11871191

1188-
p.change_file(
1189-
".cargo/config.toml",
1190-
r#"
1191-
[doc.extern-map]
1192-
std = "local"
1193-
"#,
1194-
);
1195-
11961192
p.cargo("doc -v --no-deps -Zrustdoc-map --open")
11971193
.env("BROWSER", "echo")
11981194
.masquerade_as_nightly_cargo()
1199-
.with_stderr_contains("[..] Documenting foo v0.1.0 ([..])")
1200-
.with_stderr_does_not_contain("warning: unused config key `doc.extern-map` [..]")
1195+
.with_stderr(
1196+
"\
1197+
[DOCUMENTING] foo v0.1.0 [..]
1198+
[RUNNING] `rustdoc --crate-type lib --crate-name foo src/lib.rs [..]--crate-version 0.1.0`
1199+
[FINISHED] [..]
1200+
Opening [CWD]/target/doc/foo/index.html
1201+
",
1202+
)
12011203
.run();
12021204
}
12031205

0 commit comments

Comments
 (0)