Skip to content

Commit b3069d5

Browse files
committed
Auto merge of #125026 - Oneirical:clink-tests, r=jieyouxu
Migrate `run-make/c-link-to-rust-va-list-fn` to `rmake` Part of #121876. r? `@jieyouxu`
2 parents 6be7b0c + 10c358f commit b3069d5

File tree

3 files changed

+19
-8
lines changed

3 files changed

+19
-8
lines changed

src/tools/tidy/src/allowed_run_make_makefiles.txt

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ run-make/c-dynamic-dylib/Makefile
1212
run-make/c-dynamic-rlib/Makefile
1313
run-make/c-link-to-rust-dylib/Makefile
1414
run-make/c-link-to-rust-staticlib/Makefile
15-
run-make/c-link-to-rust-va-list-fn/Makefile
1615
run-make/c-static-dylib/Makefile
1716
run-make/c-static-rlib/Makefile
1817
run-make/c-unwind-abi-catch-lib-panic/Makefile

tests/run-make/c-link-to-rust-va-list-fn/Makefile

-7
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
// test.c and its static library checkrust.rs make use of variadic functions (VaList).
2+
// This test checks that the use of this feature does not
3+
// prevent the creation of a functional binary.
4+
// See https://github.com/rust-lang/rust/pull/49878
5+
6+
//@ ignore-cross-compile
7+
8+
use run_make_support::{cc, extra_c_flags, run, rustc, static_lib};
9+
10+
fn main() {
11+
rustc().input("checkrust.rs")
12+
.run();
13+
cc().input("test.c")
14+
.input(static_lib("checkrust"))
15+
.out_exe("test")
16+
.args(&extra_c_flags())
17+
.run();
18+
run("test");
19+
}

0 commit comments

Comments
 (0)