Skip to content

Commit

Permalink
Auto merge of #125178 - GuillaumeGomez:migrate-rustdoc-with-out-dir, …
Browse files Browse the repository at this point in the history
…r=jieyouxu

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

Part of #121876.

r? `@jieyouxu`
  • Loading branch information
bors committed May 17, 2024
2 parents 1189851 + 61d4f5c commit a5c37ee
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 12 deletions.
2 changes: 1 addition & 1 deletion src/tools/run-make-support/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ pub fn python_command() -> Command {

pub fn htmldocck() -> Command {
let mut python = python_command();
python.arg(source_path().join("/src/etc/htmldocck.py"));
python.arg(source_path().join("src/etc/htmldocck.py"));
python
}

Expand Down
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 @@ -243,7 +243,6 @@ run-make/rustdoc-scrape-examples-remap/Makefile
run-make/rustdoc-scrape-examples-test/Makefile
run-make/rustdoc-scrape-examples-whitespace/Makefile
run-make/rustdoc-verify-output-files/Makefile
run-make/rustdoc-with-out-dir-option/Makefile
run-make/rustdoc-with-output-option/Makefile
run-make/rustdoc-with-short-out-dir-option/Makefile
run-make/sanitizer-cdylib-link/Makefile
Expand Down
2 changes: 1 addition & 1 deletion tests/run-make/rustdoc-scrape-examples-ordering/rmake.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,5 @@ fn main() {
}
rustdoc.run();

htmldocck().arg(out_dir).arg("src/lib.rs").status().unwrap().success();
assert!(htmldocck().arg(out_dir).arg("src/lib.rs").status().unwrap().success());
}
2 changes: 1 addition & 1 deletion tests/run-make/rustdoc-themes/rmake.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ fn main() {
std::fs::write(&test_css, test_content).unwrap();

rustdoc().output(&out_dir).input("foo.rs").arg("--theme").arg(&test_css).run();
htmldocck().arg(out_dir).arg("foo.rs").status().unwrap().success();
assert!(htmldocck().arg(out_dir).arg("foo.rs").status().unwrap().success());
}
8 changes: 0 additions & 8 deletions tests/run-make/rustdoc-with-out-dir-option/Makefile

This file was deleted.

7 changes: 7 additions & 0 deletions tests/run-make/rustdoc-with-out-dir-option/rmake.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
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").output(&out_dir).run();
assert!(htmldocck().arg(out_dir).arg("src/lib.rs").status().unwrap().success());
}

0 comments on commit a5c37ee

Please sign in to comment.