Auto merge of #125178 - GuillaumeGomez:migrate-rustdoc-with-out-dir, … · rust-lang/rust@a5c37ee (original) (raw)

File tree

6 files changed

lines changed

6 files changed

lines changed

Original file line number Diff line number Diff line change
@@ -66,7 +66,7 @@ pub fn python_command() -> Command {
66 66
67 67 pub fn htmldocck() -> Command {
68 68 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"));
70 70 python
71 71 }
72 72
Original file line number Diff line number Diff line change
@@ -243,7 +243,6 @@ run-make/rustdoc-scrape-examples-remap/Makefile
243 243 run-make/rustdoc-scrape-examples-test/Makefile
244 244 run-make/rustdoc-scrape-examples-whitespace/Makefile
245 245 run-make/rustdoc-verify-output-files/Makefile
246 -run-make/rustdoc-with-out-dir-option/Makefile
247 246 run-make/rustdoc-with-output-option/Makefile
248 247 run-make/rustdoc-with-short-out-dir-option/Makefile
249 248 run-make/sanitizer-cdylib-link/Makefile
Original file line number Diff line number Diff line change
@@ -45,5 +45,5 @@ fn main() {
45 45 }
46 46 rustdoc.run();
47 47
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());
49 49 }
Original file line number Diff line number Diff line change
@@ -27,5 +27,5 @@ fn main() {
27 27 std::fs::write(&test_css, test_content).unwrap();
28 28
29 29 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());
31 31 }
Original file line number Diff line number Diff 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 +}