Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rewrite lto-smoke, simple-rlib and mixing-deps run-make tests in rmake.rs format #125638

Merged
merged 3 commits into from
May 29, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
rewrite mixing-deps in rmake
  • Loading branch information
Oneirical committed May 28, 2024
commit 634270e8da47d36736c4f8d1c92266bed4e0cf82
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 @@ -156,7 +156,6 @@ run-make/min-global-align/Makefile
run-make/mingw-export-call-convention/Makefile
run-make/mismatching-target-triples/Makefile
run-make/missing-crate-dependency/Makefile
run-make/mixing-deps/Makefile
run-make/mixing-formats/Makefile
run-make/mixing-libs/Makefile
run-make/msvc-opt-minsize/Makefile
Expand Down
2 changes: 2 additions & 0 deletions tests/run-make/lto-smoke/rmake.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

//@ ignore-cross-compile

use run_make_support::rustc;

fn main() {
let lto_flags = ["-Clto", "-Clto=yes", "-Clto=off", "-Clto=thin", "-Clto=fat"];
for flag in lto_flags {
Expand Down
8 changes: 0 additions & 8 deletions tests/run-make/mixing-deps/Makefile

This file was deleted.

13 changes: 13 additions & 0 deletions tests/run-make/mixing-formats/rmake.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// This test invokes the main function in prog.rs, which has dependencies
// in both an rlib and a dylib. This test checks that these different library
// types can be successfully mixed.
//@ ignore-cross-compile

use run_make_support::{run, rustc};

fn main() {
rustc().input("both.rs").arg("-Cprefer-dynamic").run();
rustc().input("dylib.rs").arg("-Cprefer-dynamic").run();
rustc().input("prog.rs").run();
run("prog");
}