Skip to content

Commit

Permalink
Unrolled build for rust-lang#125485
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#125485 - GuillaumeGomez:migrate-rmake-rustdoc, r=jieyouxu

Migrate `run-make/rustdoc-with-output-dir-option` to `rmake.rs`

Part of rust-lang#121876.

r? `@jieyouxu`
  • Loading branch information
rust-timer authored May 24, 2024
2 parents 697ac29 + daff843 commit f6c04a2
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 9 deletions.
1 change: 0 additions & 1 deletion src/tools/tidy/src/allowed_run_make_makefiles.txt
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,6 @@ run-make/rmeta-preferred/Makefile
run-make/rustc-macro-dep-files/Makefile
run-make/rustdoc-io-error/Makefile
run-make/rustdoc-verify-output-files/Makefile
run-make/rustdoc-with-output-option/Makefile
run-make/sanitizer-cdylib-link/Makefile
run-make/sanitizer-dylib-link/Makefile
run-make/sanitizer-staticlib-link/Makefile
Expand Down
8 changes: 0 additions & 8 deletions tests/run-make/rustdoc-with-output-option/Makefile

This file was deleted.

16 changes: 16 additions & 0 deletions tests/run-make/rustdoc-with-output-option/rmake.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
use run_make_support::{htmldocck, rustdoc, tmp_dir};

fn main() {
let out_dir = tmp_dir().join("rustdoc");

rustdoc()
.input("src/lib.rs")
.crate_name("foobar")
.crate_type("lib")
// This is intentionally using `--output` option flag and not the `output()` method.
.arg("--output")
.arg(&out_dir)
.run();

assert!(htmldocck().arg(out_dir).arg("src/lib.rs").status().unwrap().success());
}

0 comments on commit f6c04a2

Please sign in to comment.