Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 09047b8

Browse files
authoredMay 24, 2024
Rollup merge of #125485 - GuillaumeGomez:migrate-rmake-rustdoc, r=jieyouxu
Migrate `run-make/rustdoc-with-output-dir-option` to `rmake.rs` Part of #121876. r? `@jieyouxu`
2 parents f23ebf0 + daff843 commit 09047b8

File tree

3 files changed

+16
-9
lines changed

3 files changed

+16
-9
lines changed
 

‎src/tools/tidy/src/allowed_run_make_makefiles.txt

-1
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,6 @@ run-make/rmeta-preferred/Makefile
228228
run-make/rustc-macro-dep-files/Makefile
229229
run-make/rustdoc-io-error/Makefile
230230
run-make/rustdoc-verify-output-files/Makefile
231-
run-make/rustdoc-with-output-option/Makefile
232231
run-make/sanitizer-cdylib-link/Makefile
233232
run-make/sanitizer-dylib-link/Makefile
234233
run-make/sanitizer-staticlib-link/Makefile

‎tests/run-make/rustdoc-with-output-option/Makefile

-8
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
use run_make_support::{htmldocck, rustdoc, tmp_dir};
2+
3+
fn main() {
4+
let out_dir = tmp_dir().join("rustdoc");
5+
6+
rustdoc()
7+
.input("src/lib.rs")
8+
.crate_name("foobar")
9+
.crate_type("lib")
10+
// This is intentionally using `--output` option flag and not the `output()` method.
11+
.arg("--output")
12+
.arg(&out_dir)
13+
.run();
14+
15+
assert!(htmldocck().arg(out_dir).arg("src/lib.rs").status().unwrap().success());
16+
}

0 commit comments

Comments
 (0)
Failed to load comments.