mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rewrite unstable-flag-required to rmake

Browse Source
This commit is contained in:
Oneirical 2024-07-16 14:12:12 -04:00
parent 890ef1180b
commit 3ba62f0a63
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/tools/tidy/src/allowed_run_make_makefiles.txt
View File

@ -120,5 +120,4 @@ run-make/test-benches/Makefile
run-make/thumb-none-cortex-m/Makefile run-make/thumb-none-cortex-m/Makefile
run-make/thumb-none-qemu/Makefile run-make/thumb-none-qemu/Makefile
run-make/translation/Makefile run-make/translation/Makefile
run-make/unstable-flag-required/Makefile
run-make/x86_64-fortanix-unknown-sgx-lvi/Makefile run-make/x86_64-fortanix-unknown-sgx-lvi/Makefile

4
tests/run-make/missing-crate-dependency/rmake.rs
View File

@ -3,12 +3,12 @@
// in a dependency chain. // in a dependency chain.
// See https://github.com/rust-lang/rust/issues/12146 // See https://github.com/rust-lang/rust/issues/12146
use run_make_support::{fs_wrapper, rust_lib_name, rustc}; use run_make_support::{rfs, rust_lib_name, rustc};
fn main() { fn main() {
rustc().crate_type("rlib").input("crateA.rs").run(); rustc().crate_type("rlib").input("crateA.rs").run();
rustc().crate_type("rlib").input("crateB.rs").run(); rustc().crate_type("rlib").input("crateB.rs").run();
fs_wrapper::remove_file(rust_lib_name("crateA")); rfs::remove_file(rust_lib_name("crateA"));
// Ensure that crateC fails to compile, as the crateA dependency is missing. // Ensure that crateC fails to compile, as the crateA dependency is missing.
rustc() rustc()
.input("crateC.rs") .input("crateC.rs")

4
tests/run-make/unstable-flag-required/Makefile
View File

@ -1,4 +0,0 @@
include ../tools.mk
all:
$(RUSTDOC) --output-format=json x.html 2>&1 | diff - output-format-json.stderr

12
tests/run-make/unstable-flag-required/rmake.rs Normal file
View File

@ -0,0 +1,12 @@
// The flag `--output-format` is unauthorized on beta and stable releases, which led
// to confusion for maintainers doing testing on nightly. Tying it to an unstable flag
// elucidates this, and this test checks that `--output-format` cannot be passed on its
// own.
// See https://github.com/rust-lang/rust/pull/82497
use run_make_support::{diff, rustdoc};
fn main() {
let out = rustdoc().output_format("json").input("x.html").run_fail().stderr_utf8();
diff().expected_file("output-format-json.stderr").actual_text("actual-json", out).run();
}