Skip to content

Commit

Permalink
Auto merge of #125026 - Oneirical:clink-tests, r=jieyouxu
Browse files Browse the repository at this point in the history
Migrate `run-make/c-link-to-rust-va-list-fn` to `rmake`

Part of #121876.

r? `@jieyouxu`
  • Loading branch information
bors committed May 14, 2024
2 parents fba5f44 + 812f897 commit 58426f4
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 8 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 @@ -9,7 +9,6 @@ run-make/c-dynamic-dylib/Makefile
run-make/c-dynamic-rlib/Makefile
run-make/c-link-to-rust-dylib/Makefile
run-make/c-link-to-rust-staticlib/Makefile
run-make/c-link-to-rust-va-list-fn/Makefile
run-make/c-static-dylib/Makefile
run-make/c-static-rlib/Makefile
run-make/c-unwind-abi-catch-lib-panic/Makefile
Expand Down
7 changes: 0 additions & 7 deletions tests/run-make/c-link-to-rust-va-list-fn/Makefile

This file was deleted.

18 changes: 18 additions & 0 deletions tests/run-make/c-link-to-rust-va-list-fn/rmake.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
// test.c and its static library checkrust.rs make use of variadic functions (VaList).
// This test checks that the use of this feature does not
// prevent the creation of a functional binary.
// See https://github.com/rust-lang/rust/pull/49878

//@ ignore-cross-compile

use run_make_support::{cc, extra_c_flags, run, rustc, static_lib};

fn main() {
rustc().input("checkrust.rs").run();
cc().input("test.c")
.input(static_lib("checkrust"))
.out_exe("test")
.args(&extra_c_flags())
.run();
run("test");
}

0 comments on commit 58426f4

Please sign in to comment.