Make more of the test suite run on Mac Catalyst #125226

madsmtm · 2024-05-17T20:36:04Z

Combined with #125225, the only failing parts of the test suite are in tests/rustdoc-js, tests/rustdoc-js-std and tests/debuginfo. Tested with:

./x test --target=aarch64-apple-ios-macabi library/std
./x test --target=aarch64-apple-ios-macabi --skip=tests/rustdoc-js --skip=tests/rustdoc-js-std --skip=tests/debuginfo tests

Will probably put up a PR later to enable running on (not just compiling for) Mac Catalyst in CI, though not sure where exactly I should do so? src/ci/github-actions/jobs.yml?

Note that I've deliberately not enabled stack overflow handlers on iOS/tvOS/watchOS/visionOS (see #25872), but rather just skipped those tests, as it uses quite a few APIs that I'd be weary about getting rejected by the App Store (note that Swift doesn't do it on those platforms either).

r? @workingjubilee

CC @thomcc

@rustbot label O-ios O-apple

rustbot · 2024-05-17T20:36:14Z

Some changes occurred in run-make tests.

cc @jieyouxu

Some changes occurred in src/tools/compiletest

cc @jieyouxu

jieyouxu

bootstrap, compiletest and tests/* changes look good to me. Feel free to r=me for those changes if the libs changes look good.

bors · 2024-05-21T22:30:02Z

☔ The latest upstream changes (presumably #125379) made this pull request unmergeable. Please resolve the merge conflicts.

workingjubilee

Could you rename the run-pass issues-{N}.rs tests we're diffing here to include their implied subject first, since we're touching them anyway? Well, the ones you figured out what they're for, at least, and that don't have like 5 other associated files. You don't have to do anything that touches the ENTRY_LIMIT numbers, just the Big List Of Badly Named Tests (those are less merge-conflict-y because they're separate lines of text).

tests/ui/issues/issue-33992.rs

workingjubilee · 2024-05-22T00:13:53Z

library/std/src/sys/pal/unix/stack_overflow.rs

+// This is intentionally not enabled on iOS/tvOS/watchOS/visionOS, as it uses
+// several symbols that might lead to rejections from the App Store, namely
+// `sigaction`, `sigaltstack`, `sysctlbyname`, `mmap`, `munmap` and `mprotect`.
+//
+// This might be overly cautious, though it is also what Swift does (and they
+// usually have fewer qualms about forwards compatibility, since the runtime
+// is shipped with the OS):
+// <https://github.com/apple/swift/blob/swift-5.10-RELEASE/stdlib/public/runtime/CrashHandlerMacOS.cpp>


And based on the exclusion notes on the stack-probes.rs test, we still emit binaries with __stack_chk_guard and such, right? And so do they? So it's less about whether the stack is protected and more about the error message.

Pretty sure Swift also emit stack probes (dubbed "stack protectors"), this is indeed only about the error message

tests/ui/abi/stack-probes.rs

madsmtm · 2024-05-27T13:29:19Z

Ended up touching ENTRY_LIMIT, it really made sense for the osx-frameworks.rs test. Tell me if I should revert that.

@rustbot ready

workingjubilee

Yay!

workingjubilee · 2024-05-27T21:15:51Z

@bors r+

bors · 2024-05-27T21:15:53Z

📌 Commit aeb198b has been approved by workingjubilee

It is now in the queue for this repository.

bors · 2024-05-27T23:11:18Z

☔ The latest upstream changes (presumably #125628) made this pull request unmergeable. Please resolve the merge conflicts.

This adds the `only-apple`/`ignore-apple` compiletest directive, and uses that basically everywhere instead of `only-macos`/`ignore-macos`. Some of the updates in `run-make` are a bit redundant, as they use `ignore-cross-compile` and won't run on iOS - but using Apple in these is still more correct, so I've made that change anyhow.

madsmtm · 2024-05-28T10:33:10Z

Fixed the conflict, you're probably right that I shouldn't have touched ENTRY_LIMIT...

@rustbot ready

workingjubilee · 2024-05-28T17:34:49Z

@bors r+

bors · 2024-05-28T17:34:51Z

📌 Commit e6b9bb7 has been approved by workingjubilee

It is now in the queue for this repository.

…workingjubilee Make more of the test suite run on Mac Catalyst Combined with rust-lang#125225, the only failing parts of the test suite are in `tests/rustdoc-js`, `tests/rustdoc-js-std` and `tests/debuginfo`. Tested with: ```console ./x test --target=aarch64-apple-ios-macabi library/std ./x test --target=aarch64-apple-ios-macabi --skip=tests/rustdoc-js --skip=tests/rustdoc-js-std --skip=tests/debuginfo tests ``` Will probably put up a PR later to enable _running_ on (not just compiling for) Mac Catalyst in CI, though not sure where exactly I should do so? `src/ci/github-actions/jobs.yml`? Note that I've deliberately _not_ enabled stack overflow handlers on iOS/tvOS/watchOS/visionOS (see rust-lang#25872), but rather just skipped those tests, as it uses quite a few APIs that I'd be weary about getting rejected by the App Store (note that Swift doesn't do it on those platforms either). r? `@workingjubilee` CC `@thomcc` `@rustbot` label O-ios O-apple

Rollup of 8 pull requests Successful merges: - rust-lang#124251 (Add an intrinsic for `ptr::metadata`) - rust-lang#124320 (Add `--print=check-cfg` to get the expected configs) - rust-lang#125226 (Make more of the test suite run on Mac Catalyst) - rust-lang#125381 (Silence some resolve errors when there have been glob import errors) - rust-lang#125633 (miri: avoid making a full copy of all new allocations) - rust-lang#125638 (Rewrite `lto-smoke`, `simple-rlib` and `mixing-deps` `run-make` tests in `rmake.rs` format) - rust-lang#125639 (Support `./x doc run-make-support --open`) - rust-lang#125664 (Tweak relations to no longer rely on `TypeTrace`) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#125226 - madsmtm:fix-mac-catalyst-tests, r=workingjubilee Make more of the test suite run on Mac Catalyst Combined with rust-lang#125225, the only failing parts of the test suite are in `tests/rustdoc-js`, `tests/rustdoc-js-std` and `tests/debuginfo`. Tested with: ```console ./x test --target=aarch64-apple-ios-macabi library/std ./x test --target=aarch64-apple-ios-macabi --skip=tests/rustdoc-js --skip=tests/rustdoc-js-std --skip=tests/debuginfo tests ``` Will probably put up a PR later to enable _running_ on (not just compiling for) Mac Catalyst in CI, though not sure where exactly I should do so? `src/ci/github-actions/jobs.yml`? Note that I've deliberately _not_ enabled stack overflow handlers on iOS/tvOS/watchOS/visionOS (see rust-lang#25872), but rather just skipped those tests, as it uses quite a few APIs that I'd be weary about getting rejected by the App Store (note that Swift doesn't do it on those platforms either). r? ``@workingjubilee`` CC ``@thomcc`` ``@rustbot`` label O-ios O-apple

rustbot assigned workingjubilee May 17, 2024

rustbot added O-apple Operating system: Apple (macOS, iOS, tvOS, visionOS, watchOS) O-ios Operating system: iOS labels May 17, 2024

madsmtm mentioned this pull request May 17, 2024

Enable segfault / bus error handlers on more UNIX platforms #25872

Open

jieyouxu approved these changes May 18, 2024

View reviewed changes

madsmtm force-pushed the fix-mac-catalyst-tests branch from 9d010c9 to 6add45f Compare May 21, 2024 22:46

workingjubilee requested changes May 22, 2024

View reviewed changes

tests/ui/issues/issue-33992.rs Show resolved Hide resolved

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 22, 2024

workingjubilee reviewed May 22, 2024

View reviewed changes

tests/ui/abi/stack-probes.rs Show resolved Hide resolved

workingjubilee mentioned this pull request May 22, 2024

Should have a stack-probe test that doesn't need std's overflow handler #125390

Open

madsmtm force-pushed the fix-mac-catalyst-tests branch from 6add45f to 8e698a4 Compare May 27, 2024 13:27

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 27, 2024

This comment has been minimized.

Sign in to view

madsmtm force-pushed the fix-mac-catalyst-tests branch from 8e698a4 to aeb198b Compare May 27, 2024 14:17

workingjubilee approved these changes May 27, 2024

View reviewed changes

bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 27, 2024

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 27, 2024

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 27, 2024

madsmtm added 3 commits May 28, 2024 12:31

Enable a few tests on macOS

d82be82

Disable stack overflow handler tests on iOS-like platforms

37ae2b6

madsmtm force-pushed the fix-mac-catalyst-tests branch from aeb198b to e6b9bb7 Compare May 28, 2024 10:32

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 28, 2024

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 28, 2024

jieyouxu mentioned this pull request May 28, 2024

Rollup of 8 pull requests #125689

Closed

jieyouxu mentioned this pull request May 29, 2024

Rollup of 8 pull requests #125691

Merged

bors merged commit 3cc59ae into rust-lang:master May 29, 2024
6 checks passed

rustbot added this to the 1.80.0 milestone May 29, 2024

madsmtm deleted the fix-mac-catalyst-tests branch May 29, 2024 09:40

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make more of the test suite run on Mac Catalyst #125226

Make more of the test suite run on Mac Catalyst #125226

madsmtm commented May 17, 2024

rustbot commented May 17, 2024

jieyouxu left a comment

bors commented May 21, 2024

workingjubilee left a comment •

edited

workingjubilee May 22, 2024

madsmtm May 27, 2024 •

edited

madsmtm commented May 27, 2024 •

edited

This comment has been minimized.

workingjubilee left a comment

workingjubilee commented May 27, 2024

bors commented May 27, 2024

bors commented May 27, 2024

madsmtm commented May 28, 2024

workingjubilee commented May 28, 2024

bors commented May 28, 2024

Make more of the test suite run on Mac Catalyst #125226

Make more of the test suite run on Mac Catalyst #125226

Conversation

madsmtm commented May 17, 2024

rustbot commented May 17, 2024

jieyouxu left a comment

Choose a reason for hiding this comment

bors commented May 21, 2024

workingjubilee left a comment • edited

Choose a reason for hiding this comment

workingjubilee May 22, 2024

Choose a reason for hiding this comment

madsmtm May 27, 2024 • edited

Choose a reason for hiding this comment

madsmtm commented May 27, 2024 • edited

This comment has been minimized.

workingjubilee left a comment

Choose a reason for hiding this comment

workingjubilee commented May 27, 2024

bors commented May 27, 2024

bors commented May 27, 2024

madsmtm commented May 28, 2024

workingjubilee commented May 28, 2024

bors commented May 28, 2024

workingjubilee left a comment •

edited

madsmtm May 27, 2024 •

edited

madsmtm commented May 27, 2024 •

edited