Skip to content

Commit 3ba62f0

Browse files
committed
rewrite unstable-flag-required to rmake
1 parent 890ef11 commit 3ba62f0

File tree

4 files changed

+14
-7
lines changed

4 files changed

+14
-7
lines changed

src/tools/tidy/src/allowed_run_make_makefiles.txt

-1
Original file line numberDiff line numberDiff line change
@@ -120,5 +120,4 @@ run-make/test-benches/Makefile
120120
run-make/thumb-none-cortex-m/Makefile
121121
run-make/thumb-none-qemu/Makefile
122122
run-make/translation/Makefile
123-
run-make/unstable-flag-required/Makefile
124123
run-make/x86_64-fortanix-unknown-sgx-lvi/Makefile

tests/run-make/missing-crate-dependency/rmake.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
// in a dependency chain.
44
// See https://github.com/rust-lang/rust/issues/12146
55

6-
use run_make_support::{fs_wrapper, rust_lib_name, rustc};
6+
use run_make_support::{rfs, rust_lib_name, rustc};
77

88
fn main() {
99
rustc().crate_type("rlib").input("crateA.rs").run();
1010
rustc().crate_type("rlib").input("crateB.rs").run();
11-
fs_wrapper::remove_file(rust_lib_name("crateA"));
11+
rfs::remove_file(rust_lib_name("crateA"));
1212
// Ensure that crateC fails to compile, as the crateA dependency is missing.
1313
rustc()
1414
.input("crateC.rs")

tests/run-make/unstable-flag-required/Makefile

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

0 commit comments

Comments
 (0)