Skip to content

Commit 7e76a62

Browse files
authored
Unrolled build for rust-lang#127116
Rollup merge of rust-lang#127116 - GuillaumeGomez:run-make-return-non-c-like-enum, r=Kobzol,jieyouxu Migrate `run-make/return-non-c-like-enum` to `rmake.rs` Part of rust-lang#121876. r? `@Kobzol`
2 parents f845335 + 8cbeeda commit 7e76a62

File tree

3 files changed

+18
-9
lines changed

3 files changed

+18
-9
lines changed

src/tools/tidy/src/allowed_run_make_makefiles.txt

-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ run-make/remap-path-prefix/Makefile
147147
run-make/reproducible-build-2/Makefile
148148
run-make/reproducible-build/Makefile
149149
run-make/return-non-c-like-enum-from-c/Makefile
150-
run-make/return-non-c-like-enum/Makefile
151150
run-make/rlib-chain/Makefile
152151
run-make/rlib-format-packed-bundled-libs-2/Makefile
153152
run-make/rlib-format-packed-bundled-libs-3/Makefile

tests/run-make/return-non-c-like-enum/Makefile

-8
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
// Check that we treat enum variants like union members in call ABIs.
2+
// Added in #68443.
3+
// Original issue: #68190.
4+
5+
//@ ignore-cross-compile
6+
7+
use run_make_support::{cc, extra_c_flags, extra_cxx_flags, run, rustc, static_lib_name};
8+
9+
fn main() {
10+
rustc().crate_type("staticlib").input("nonclike.rs").run();
11+
cc().input("test.c")
12+
.arg(&static_lib_name("nonclike"))
13+
.out_exe("test")
14+
.args(&extra_c_flags())
15+
.args(&extra_cxx_flags())
16+
.run();
17+
run("test");
18+
}

0 commit comments

Comments
 (0)