Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit dd5163a

Browse files
authoredMay 29, 2024
Unrolled build for rust-lang#125226
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
2 parents da159eb + e6b9bb7 commit dd5163a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+120
-100
lines changed
 

‎tests/ui/intrinsics/intrinsic-alignment.rs

+15-14
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,21 @@ mod rusti {
1010
}
1111
}
1212

13-
#[cfg(any(target_os = "android",
14-
target_os = "dragonfly",
15-
target_os = "emscripten",
16-
target_os = "freebsd",
17-
target_os = "fuchsia",
18-
target_os = "hurd",
19-
target_os = "illumos",
20-
target_os = "linux",
21-
target_os = "macos",
22-
target_os = "netbsd",
23-
target_os = "openbsd",
24-
target_os = "solaris",
25-
target_os = "vxworks",
26-
target_os = "nto",
13+
#[cfg(any(
14+
target_os = "android",
15+
target_os = "dragonfly",
16+
target_os = "emscripten",
17+
target_os = "freebsd",
18+
target_os = "fuchsia",
19+
target_os = "hurd",
20+
target_os = "illumos",
21+
target_os = "linux",
22+
target_os = "netbsd",
23+
target_os = "openbsd",
24+
target_os = "solaris",
25+
target_os = "vxworks",
26+
target_os = "nto",
27+
target_vendor = "apple",
2728
))]
2829
mod m {
2930
#[cfg(target_arch = "x86")]

‎tests/ui/issues/issue-45731.rs

+9-4
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,24 @@
22
#![allow(unused_variables)]
33
//@ compile-flags:--test -g
44

5-
#[cfg(target_os = "macos")]
5+
#[cfg(target_vendor = "apple")]
66
#[test]
77
fn simple_test() {
8-
use std::{env, panic, fs};
8+
use std::{env, fs, panic};
99

1010
// Find our dSYM and replace the DWARF binary with an empty file
1111
let mut dsym_path = env::current_exe().unwrap();
1212
let executable_name = dsym_path.file_name().unwrap().to_str().unwrap().to_string();
1313
assert!(dsym_path.pop()); // Pop executable
1414
dsym_path.push(format!("{}.dSYM/Contents/Resources/DWARF/{0}", executable_name));
1515
{
16-
let file = fs::OpenOptions::new().read(false).write(true).truncate(true).create(false)
17-
.open(&dsym_path).unwrap();
16+
let file = fs::OpenOptions::new()
17+
.read(false)
18+
.write(true)
19+
.truncate(true)
20+
.create(false)
21+
.open(&dsym_path)
22+
.unwrap();
1823
}
1924

2025
env::set_var("RUST_BACKTRACE", "1");
There was a problem loading the remainder of the diff.

0 commit comments

Comments
 (0)
Failed to load comments.