diff options
| author | bors <bors@rust-lang.org> | 2024-06-16 12:34:44 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-06-16 12:34:44 +0000 |
| commit | f6236f63d2c2ccbb363cf98f29c994d60ad1eb64 (patch) | |
| tree | 94a5753fed25d931cd80f43722def282c7f56701 | |
| parent | 12b33d36f3de0fb30ca08c49f5b2f4fa111861a4 (diff) | |
| parent | ac751b3049ac6b7d080eae796acb215c5eb36df3 (diff) | |
| download | rust-f6236f63d2c2ccbb363cf98f29c994d60ad1eb64.tar.gz rust-f6236f63d2c2ccbb363cf98f29c994d60ad1eb64.zip | |
Auto merge of #126542 - GuillaumeGomez:migrate-run-make-duplicate-output-flavors, r=Kobzol
Migrate `run-make/duplicate-output-flavors` to `rmake.rs` Part of https://github.com/rust-lang/rust/issues/121876. r? `@jieyouxu`
| -rw-r--r-- | src/tools/tidy/src/allowed_run_make_makefiles.txt | 1 | ||||
| -rw-r--r-- | tests/run-make/duplicate-output-flavors/Makefile | 5 | ||||
| -rw-r--r-- | tests/run-make/duplicate-output-flavors/rmake.rs | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/tools/tidy/src/allowed_run_make_makefiles.txt b/src/tools/tidy/src/allowed_run_make_makefiles.txt index f45e9e766a9..fdd0be79a4d 100644 --- a/src/tools/tidy/src/allowed_run_make_makefiles.txt +++ b/src/tools/tidy/src/allowed_run_make_makefiles.txt @@ -29,7 +29,6 @@ run-make/dep-info-spaces/Makefile run-make/dep-info/Makefile run-make/dump-ice-to-disk/Makefile run-make/dump-mono-stats/Makefile -run-make/duplicate-output-flavors/Makefile run-make/dylib-chain/Makefile run-make/emit-path-unhashed/Makefile run-make/emit-shared-files/Makefile diff --git a/tests/run-make/duplicate-output-flavors/Makefile b/tests/run-make/duplicate-output-flavors/Makefile deleted file mode 100644 index e33279966c9..00000000000 --- a/tests/run-make/duplicate-output-flavors/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -include ../tools.mk - -all: - $(RUSTC) --crate-type=rlib foo.rs - $(RUSTC) --crate-type=rlib,rlib foo.rs diff --git a/tests/run-make/duplicate-output-flavors/rmake.rs b/tests/run-make/duplicate-output-flavors/rmake.rs new file mode 100644 index 00000000000..09545228807 --- /dev/null +++ b/tests/run-make/duplicate-output-flavors/rmake.rs @@ -0,0 +1,6 @@ +use run_make_support::rustc; + +fn main() { + rustc().input("foo.rs").crate_type("rlib").run(); + rustc().input("foo.rs").crate_type("rlib,rlib").run(); +} |