Skip to content

Commit

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

Migrate `run-make/rustdoc-map-file` to rmake

Part of rust-lang#121876.

r? `@jieyouxu`
  • Loading branch information
rust-timer authored May 9, 2024
2 parents 37dc766 + c078a44 commit 50c310a
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 6 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 @@ -245,7 +245,6 @@ run-make/rlib-format-packed-bundled-libs/Makefile
run-make/rmeta-preferred/Makefile
run-make/rustc-macro-dep-files/Makefile
run-make/rustdoc-io-error/Makefile
run-make/rustdoc-map-file/Makefile
run-make/rustdoc-output-path/Makefile
run-make/rustdoc-scrape-examples-invalid-expr/Makefile
run-make/rustdoc-scrape-examples-macros/Makefile
Expand Down
5 changes: 0 additions & 5 deletions tests/run-make/rustdoc-map-file/Makefile

This file was deleted.

15 changes: 15 additions & 0 deletions tests/run-make/rustdoc-map-file/rmake.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
use run_make_support::{rustdoc, tmp_dir};
use std::process::Command;

fn main() {
let out_dir = tmp_dir().join("out");
rustdoc()
.input("foo.rs")
.arg("-Zunstable-options")
.arg("--generate-redirect-map")
.output(&out_dir)
.run();
// FIXME (GuillaumeGomez): Port the python script to Rust as well.
let python = std::env::var("PYTHON").unwrap_or("python".into());
assert!(Command::new(python).arg("validate_json.py").arg(&out_dir).status().unwrap().success());
}

0 comments on commit 50c310a

Please sign in to comment.