Skip to content

Commit eb88448

Browse files
committed
ci: Add an x86_64-apple job
I'm not sure why this was missing: possibly because it was only previously only possible to test with macos-13. GHA now has macos-15-intel which makes this easier, so add the job back.
1 parent bad4627 commit eb88448

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

.github/workflows/ci.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,8 @@ jobs:
212212
- target: wasm32-unknown-emscripten
213213
- target: wasm32-wasip1
214214
- target: wasm32-wasip2
215+
- target: x86_64-apple-darwin
216+
os: macos-15-intel
215217
- target: x86_64-linux-android
216218
# FIXME: Exec format error (os error 8)
217219
# - target: x86_64-unknown-linux-gnux32

libc-test/build.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,13 +309,16 @@ fn test_apple(target: &str) {
309309
(x86_64, "crt_externs.h"),
310310
);
311311

312-
cfg.skip_struct(|s| {
312+
cfg.skip_struct(move |s| {
313313
match s.ident() {
314314
// FIXME(macos): The size is changed in recent macOSes.
315315
"malloc_zone_t" => true,
316316
// it is a moving target, changing through versions
317317
// also contains bitfields members
318318
"tcp_connection_info" => true,
319+
320+
// FIXME(macos): The size is changed in recent macOSes.
321+
"malloc_introspection_t" if x86_64 => true,
319322
_ => false,
320323
}
321324
});
@@ -337,6 +340,8 @@ fn test_apple(target: &str) {
337340
cfg.skip_fn(move |func| {
338341
// skip those that are manually verified
339342
match func.ident() {
343+
// close calls the close_nocancel system call on x86
344+
"close" if x86_64 => true,
340345
// FIXME(1.0): std removed libresolv support: https://github.com/rust-lang/rust/pull/102766
341346
"res_init" => true,
342347
_ => false,

src/unix/bsd/apple/b64/x86_64/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ s! {
77
_private: [crate::uintptr_t; 16], // FIXME(macos): keeping private for now
88
}
99

10+
// FIXME(1.0): This should not implement `PartialEq`
11+
#[allow(unpredictable_function_pointer_comparisons)]
1012
pub struct malloc_zone_t {
1113
_reserved1: *mut c_void,
1214
_reserved2: *mut c_void,

0 commit comments

Comments
 (0)