Skip to content

Commit

Permalink
Rollup merge of rust-lang#124963 - GuillaumeGomez:migrate-rustdoc-sha…
Browse files Browse the repository at this point in the history
…red-flags, r=jieyouxu

Migrate `run-make/rustdoc-shared-flags` to rmake

Part of rust-lang#121876.

r? ```@jieyouxu```
  • Loading branch information
matthiaskrgr authored May 11, 2024
2 parents beef360 + 8167a35 commit 864fce5
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 19 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 @@ -252,7 +252,6 @@ run-make/rustdoc-scrape-examples-ordering/Makefile
run-make/rustdoc-scrape-examples-remap/Makefile
run-make/rustdoc-scrape-examples-test/Makefile
run-make/rustdoc-scrape-examples-whitespace/Makefile
run-make/rustdoc-shared-flags/Makefile
run-make/rustdoc-target-spec-json-path/Makefile
run-make/rustdoc-themes/Makefile
run-make/rustdoc-verify-output-files/Makefile
Expand Down
18 changes: 0 additions & 18 deletions tests/run-make/rustdoc-shared-flags/Makefile

This file was deleted.

14 changes: 14 additions & 0 deletions tests/run-make/rustdoc-shared-flags/rmake.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
use run_make_support::{rustc, rustdoc, Diff};

fn compare_outputs(args: &[&str]) {
let rustc_output = String::from_utf8(rustc().args(args).command_output().stdout).unwrap();
let rustdoc_output = String::from_utf8(rustdoc().args(args).command_output().stdout).unwrap();

Diff::new().expected_text("rustc", rustc_output).actual_text("rustdoc", rustdoc_output).run();
}

fn main() {
compare_outputs(&["-C", "help"]);
compare_outputs(&["-Z", "help"]);
compare_outputs(&["-C", "passes=list"]);
}

0 comments on commit 864fce5

Please sign in to comment.