Skip to content

Commit a5c37ee

Browse files
committed
Auto merge of #125178 - GuillaumeGomez:migrate-rustdoc-with-out-dir, r=jieyouxu
Migrate `run-make/rustdoc-with-out-dir-option` to new `rmake.rs` Part of #121876. r? `@jieyouxu`
2 parents 1189851 + 61d4f5c commit a5c37ee

File tree

6 files changed

+10
-12
lines changed

6 files changed

+10
-12
lines changed

src/tools/run-make-support/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ pub fn python_command() -> Command {
6666

6767
pub fn htmldocck() -> Command {
6868
let mut python = python_command();
69-
python.arg(source_path().join("/src/etc/htmldocck.py"));
69+
python.arg(source_path().join("src/etc/htmldocck.py"));
7070
python
7171
}
7272

src/tools/tidy/src/allowed_run_make_makefiles.txt

-1
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,6 @@ run-make/rustdoc-scrape-examples-remap/Makefile
243243
run-make/rustdoc-scrape-examples-test/Makefile
244244
run-make/rustdoc-scrape-examples-whitespace/Makefile
245245
run-make/rustdoc-verify-output-files/Makefile
246-
run-make/rustdoc-with-out-dir-option/Makefile
247246
run-make/rustdoc-with-output-option/Makefile
248247
run-make/rustdoc-with-short-out-dir-option/Makefile
249248
run-make/sanitizer-cdylib-link/Makefile

tests/run-make/rustdoc-scrape-examples-ordering/rmake.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,5 @@ fn main() {
4545
}
4646
rustdoc.run();
4747

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

tests/run-make/rustdoc-themes/rmake.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ fn main() {
2727
std::fs::write(&test_css, test_content).unwrap();
2828

2929
rustdoc().output(&out_dir).input("foo.rs").arg("--theme").arg(&test_css).run();
30-
htmldocck().arg(out_dir).arg("foo.rs").status().unwrap().success();
30+
assert!(htmldocck().arg(out_dir).arg("foo.rs").status().unwrap().success());
3131
}

tests/run-make/rustdoc-with-out-dir-option/Makefile

-8
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
use run_make_support::{htmldocck, rustdoc, tmp_dir};
2+
3+
fn main() {
4+
let out_dir = tmp_dir().join("rustdoc");
5+
rustdoc().input("src/lib.rs").crate_name("foobar").crate_type("lib").output(&out_dir).run();
6+
assert!(htmldocck().arg(out_dir).arg("src/lib.rs").status().unwrap().success());
7+
}

0 commit comments

Comments
 (0)