Skip to content

Commit

Permalink
Unrolled build for rust-lang#127116
Browse files Browse the repository at this point in the history
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`
  • Loading branch information
rust-timer committed Jun 29, 2024
2 parents f845335 + 8cbeeda commit 7e76a62
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 9 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 @@ -147,7 +147,6 @@ run-make/remap-path-prefix/Makefile
run-make/reproducible-build-2/Makefile
run-make/reproducible-build/Makefile
run-make/return-non-c-like-enum-from-c/Makefile
run-make/return-non-c-like-enum/Makefile
run-make/rlib-chain/Makefile
run-make/rlib-format-packed-bundled-libs-2/Makefile
run-make/rlib-format-packed-bundled-libs-3/Makefile
Expand Down
8 changes: 0 additions & 8 deletions tests/run-make/return-non-c-like-enum/Makefile

This file was deleted.

18 changes: 18 additions & 0 deletions tests/run-make/return-non-c-like-enum/rmake.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
// Check that we treat enum variants like union members in call ABIs.
// Added in #68443.
// Original issue: #68190.

//@ ignore-cross-compile

use run_make_support::{cc, extra_c_flags, extra_cxx_flags, run, rustc, static_lib_name};

fn main() {
rustc().crate_type("staticlib").input("nonclike.rs").run();
cc().input("test.c")
.arg(&static_lib_name("nonclike"))
.out_exe("test")
.args(&extra_c_flags())
.args(&extra_cxx_flags())
.run();
run("test");
}

0 comments on commit 7e76a62

Please sign in to comment.