Skip to content

Commit 25b6c8c

Browse files
committed
test: apple: Remove unneeded test skips
Quite a few skipped tests now pass, so test configuration can be simplified. (backport <#4764>) (cherry picked from commit 0209508)
1 parent cbe9f02 commit 25b6c8c

File tree

1 file changed

+3
-42
lines changed

1 file changed

+3
-42
lines changed

libc-test/build.rs

Lines changed: 3 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,7 @@ fn test_apple(target: &str) {
240240
"os/clock.h",
241241
"os/lock.h",
242242
"os/signpost.h",
243-
// FIXME(macos): Requires the macOS 14.4 SDK.
244-
//"os/os_sync_wait_on_address.h",
243+
"os/os_sync_wait_on_address.h",
245244
"poll.h",
246245
"pthread.h",
247246
"pthread_spis.h",
@@ -318,21 +317,15 @@ fn test_apple(target: &str) {
318317
// it is a moving target, changing through versions
319318
// also contains bitfields members
320319
"tcp_connection_info" => true,
321-
// FIXME(macos): The size is changed in recent macOSes.
322-
"malloc_introspection_t" => true,
323320
_ => false,
324321
}
325322
});
326323

327324
cfg.skip_alias(|ty| ty.ident().starts_with("__c_anonymous_"));
328325
cfg.skip_alias(|ty| {
329326
match ty.ident() {
330-
// FIXME(macos): Requires the macOS 14.4 SDK.
331-
"os_sync_wake_by_address_flags_t" | "os_sync_wait_on_address_flags_t" => true,
332-
333327
// FIXME(macos): "'__uint128' undeclared" in C
334328
"__uint128" => true,
335-
336329
_ => false,
337330
}
338331
});
@@ -341,7 +334,7 @@ fn test_apple(target: &str) {
341334
match constant.ident() {
342335
// They're declared via `deprecated_mach` and we don't support it anymore.
343336
x if x.starts_with("VM_FLAGS_") => true,
344-
// These OSX constants are removed in Sierra.
337+
// FIXME(deprecated): These OSX constants are removed in Sierra.
345338
// https://developer.apple.com/library/content/releasenotes/General/APIDiffsMacOS10_12/Swift/Darwin.html
346339
"KERN_KDENABLE_BG_TRACE" | "KERN_KDDISABLE_BG_TRACE" => true,
347340
// FIXME(macos): the value has been changed since Catalina (0xffff0000 -> 0x3fff0000).
@@ -350,12 +343,6 @@ fn test_apple(target: &str) {
350343
// FIXME(macos): XCode 13.1 doesn't have it.
351344
"TIOCREMOTE" => true,
352345

353-
// FIXME(macos): Requires the macOS 14.4 SDK.
354-
"OS_SYNC_WAKE_BY_ADDRESS_NONE"
355-
| "OS_SYNC_WAKE_BY_ADDRESS_SHARED"
356-
| "OS_SYNC_WAIT_ON_ADDRESS_NONE"
357-
| "OS_SYNC_WAIT_ON_ADDRESS_SHARED" => true,
358-
359346
_ => false,
360347
}
361348
});
@@ -365,41 +352,17 @@ fn test_apple(target: &str) {
365352
match func.ident() {
366353
// FIXME: https://github.com/rust-lang/libc/issues/1272
367354
"execv" | "execve" | "execvp" => true,
368-
// close calls the close_nocancel system call
369-
"close" => true,
370-
371355
// FIXME(1.0): std removed libresolv support: https://github.com/rust-lang/rust/pull/102766
372356
"res_init" => true,
373-
374-
// FIXME(macos): remove once the target in CI is updated
375-
"pthread_jit_write_freeze_callbacks_np" => true,
376-
377-
// FIXME(macos): ABI has been changed on recent macOSes.
378-
"os_unfair_lock_assert_owner" | "os_unfair_lock_assert_not_owner" => true,
379-
380-
// FIXME(macos): Once the SDK get updated to Ventura's level
381-
"freadlink" | "mknodat" | "mkfifoat" => true,
382-
383-
// FIXME(macos): Requires the macOS 14.4 SDK.
384-
"os_sync_wake_by_address_any"
385-
| "os_sync_wake_by_address_all"
386-
| "os_sync_wake_by_address_flags_t"
387-
| "os_sync_wait_on_address"
388-
| "os_sync_wait_on_address_flags_t"
389-
| "os_sync_wait_on_address_with_deadline"
390-
| "os_sync_wait_on_address_with_timeout" => true,
391-
392357
_ => false,
393358
}
394359
});
395360

396361
cfg.skip_struct_field(move |struct_, field| {
397362
match (struct_.ident(), field.ident()) {
398-
// FIXME(macos): the array size has been changed since macOS 10.15 ([8] -> [7]).
399-
("statfs", "f_reserved") => true,
400-
("__darwin_arm_neon_state64", "__v") => true,
401363
// MAXPATHLEN is too big for auto-derive traits on arrays.
402364
("vnode_info_path", "vip_path") => true,
365+
// Anonymous ADT fields
403366
("ifreq", "ifr_ifru") => true,
404367
("in6_ifreq", "ifr_ifru") => true,
405368
("ifkpi", "ifk_data") => true,
@@ -450,8 +413,6 @@ fn test_apple(target: &str) {
450413
cfg.skip_roundtrip(move |s| match s {
451414
// FIXME(macos): this type has the wrong ABI
452415
"max_align_t" if i686 => true,
453-
// Can't return an array from a C function.
454-
"uuid_t" | "vol_capabilities_set_t" => true,
455416
_ => false,
456417
});
457418

0 commit comments

Comments
 (0)