Rollup merge of rust-lang#125226 - madsmtm:fix-mac-catalyst-tests, r=workingjubilee

jieyouxu · web-flow · commit 1aaf0a9adac6 · 2024-05-29T03:25:08.000+01:00
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
diff --git a/std/src/fs/tests.rs b/std/src/fs/tests.rs
@@ -1431,7 +1431,7 @@ fn metadata_access_times() {
     assert_eq!(check!(a.modified()), check!(a.modified()));
     assert_eq!(check!(b.accessed()), check!(b.modified()));
 
-    if cfg!(target_os = "macos") || cfg!(target_os = "windows") {
+    if cfg!(target_vendor = "apple") || cfg!(target_os = "windows") {
         check!(a.created());
         check!(b.created());
     }
diff --git a/std/src/sys/pal/unix/stack_overflow.rs b/std/src/sys/pal/unix/stack_overflow.rs
@@ -491,6 +491,14 @@ mod imp {
     }
 }
 
+// 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>
 #[cfg(not(any(
     target_os = "linux",
     target_os = "freebsd",

Original file line number	Diff line number	Diff line change
`@@ -1431,7 +1431,7 @@ fn metadata_access_times() {`
`1431`	`1431`	`assert_eq!(check!(a.modified()), check!(a.modified()));`
`1432`	`1432`	`assert_eq!(check!(b.accessed()), check!(b.modified()));`
`1433`	`1433`
`1434`		`- if cfg!(target_os = "macos") \|\| cfg!(target_os = "windows") {`
	`1434`	`+ if cfg!(target_vendor = "apple") \|\| cfg!(target_os = "windows") {`
`1435`	`1435`	`check!(a.created());`
`1436`	`1436`	`check!(b.created());`
`1437`	`1437`	`}`
Original file line number	Diff line number	Diff line change
`@@ -491,6 +491,14 @@ mod imp {`
`491`	`491`	`}`
`492`	`492`	`}`
`493`	`493`
	`494`	`+// This is intentionally not enabled on iOS/tvOS/watchOS/visionOS, as it uses`
	`495`	`+// several symbols that might lead to rejections from the App Store, namely`
	`496`	+// `sigaction`, `sigaltstack`, `sysctlbyname`, `mmap`, `munmap` and `mprotect`.
	`497`	`+//`
	`498`	`+// This might be overly cautious, though it is also what Swift does (and they`
	`499`	`+// usually have fewer qualms about forwards compatibility, since the runtime`
	`500`	`+// is shipped with the OS):`
	`501`	`+// <https://github.com/apple/swift/blob/swift-5.10-RELEASE/stdlib/public/runtime/CrashHandlerMacOS.cpp>`
`494`	`502`	`#[cfg(not(any(`
`495`	`503`	`target_os = "linux",`
`496`	`504`	`target_os = "freebsd",`