Skip to content

Commit

Permalink
Rollup merge of #126898 - GuillaumeGomez:migrate-run-make-link-framew…
Browse files Browse the repository at this point in the history
…ork, r=Kobzol

Migrate `run-make/link-framework` to `rmake.rs`

Part of #121876.

r? ``@Kobzol``

try-job: x86_64-apple-1
  • Loading branch information
matthiaskrgr authored Jul 23, 2024
2 parents 9d4daf8 + e8e6111 commit f1a29ee
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 24 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 @@ -39,7 +39,6 @@ run-make/libtest-json/Makefile
run-make/libtest-junit/Makefile
run-make/libtest-thread-limit/Makefile
run-make/link-cfg/Makefile
run-make/link-framework/Makefile
run-make/long-linker-command-lines-cmd-exe/Makefile
run-make/long-linker-command-lines/Makefile
run-make/lto-linkage-used-attr/Makefile
Expand Down
23 changes: 0 additions & 23 deletions tests/run-make/link-framework/Makefile

This file was deleted.

38 changes: 38 additions & 0 deletions tests/run-make/link-framework/rmake.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
// Check that linking to a framework actually makes it to the linker.

//@ only-apple

use run_make_support::{cmd, rustc};

fn main() {
rustc().input("dep-link-framework.rs").run();
rustc().input("dep-link-weak-framework.rs").run();

rustc().input("empty.rs").run();
cmd("otool").arg("-L").arg("no-link").run_fail().assert_stdout_not_contains("CoreFoundation");

rustc().input("link-framework.rs").run();
cmd("otool")
.arg("-L")
.arg("link-framework")
.run()
.assert_stdout_contains("CoreFoundation")
.assert_stdout_not_contains("weak");

rustc().input("link-weak-framework.rs").run();
cmd("otool")
.arg("-L")
.arg("link-weak-framework")
.run()
.assert_stdout_contains("CoreFoundation")
.assert_stdout_contains("weak");

// When linking the framework both normally, and weakly, the weak linking takes preference.
rustc().input("link-both.rs").run();
cmd("otool")
.arg("-L")
.arg("link-both")
.run()
.assert_stdout_contains("CoreFoundation")
.assert_stdout_contains("weak");
}

0 comments on commit f1a29ee

Please sign in to comment.