Skip to content

Commit 0209508

Browse files
committed
test: apple: Remove unneeded test skips
Quite a few skipped tests now pass, so test configuration can be simplified.
1 parent 147b462 commit 0209508

File tree

1 file changed

+3
-45
lines changed

1 file changed

+3
-45
lines changed

libc-test/build.rs

Lines changed: 3 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,7 @@ fn test_apple(target: &str) {
232232
"os/clock.h",
233233
"os/lock.h",
234234
"os/signpost.h",
235-
// FIXME(macos): Requires the macOS 14.4 SDK.
236-
//"os/os_sync_wait_on_address.h",
235+
"os/os_sync_wait_on_address.h",
237236
"poll.h",
238237
"pthread.h",
239238
"pthread_spis.h",
@@ -308,30 +307,22 @@ fn test_apple(target: &str) {
308307
// it is a moving target, changing through versions
309308
// also contains bitfields members
310309
"tcp_connection_info" => true,
311-
// FIXME(macos): The size is changed in recent macOSes.
312-
"malloc_introspection_t" => true,
313-
// sonoma changes the padding `rmx_filler` field.
314-
"rt_metrics" => true,
315310
_ => false,
316311
}
317312
});
318313

319314
cfg.skip_alias(|ty| ty.ident().starts_with("__c_anonymous_"));
320315
cfg.skip_alias(|ty| {
321316
match ty.ident() {
322-
// FIXME(macos): Requires the macOS 14.4 SDK.
323-
"os_sync_wake_by_address_flags_t" | "os_sync_wait_on_address_flags_t" => true,
324-
325317
// FIXME(macos): "'__uint128' undeclared" in C
326318
"__uint128" => true,
327-
328319
_ => false,
329320
}
330321
});
331322

332323
cfg.skip_const(move |constant| {
333324
match constant.ident() {
334-
// These OSX constants are removed in Sierra.
325+
// FIXME(deprecated): These OSX constants are removed in Sierra.
335326
// https://developer.apple.com/library/content/releasenotes/General/APIDiffsMacOS10_12/Swift/Darwin.html
336327
"KERN_KDENABLE_BG_TRACE" | "KERN_KDDISABLE_BG_TRACE" => true,
337328
// FIXME(macos): the value has been changed since Catalina (0xffff0000 -> 0x3fff0000).
@@ -340,53 +331,22 @@ fn test_apple(target: &str) {
340331
// FIXME(macos): XCode 13.1 doesn't have it.
341332
"TIOCREMOTE" => true,
342333

343-
// FIXME(macos): Requires the macOS 14.4 SDK.
344-
"OS_SYNC_WAKE_BY_ADDRESS_NONE"
345-
| "OS_SYNC_WAKE_BY_ADDRESS_SHARED"
346-
| "OS_SYNC_WAIT_ON_ADDRESS_NONE"
347-
| "OS_SYNC_WAIT_ON_ADDRESS_SHARED" => true,
348-
349334
_ => false,
350335
}
351336
});
352337

353338
cfg.skip_fn(move |func| {
354339
// skip those that are manually verified
355340
match func.ident() {
356-
// close calls the close_nocancel system call
357-
"close" => true,
358-
359341
// FIXME(1.0): std removed libresolv support: https://github.com/rust-lang/rust/pull/102766
360342
"res_init" => true,
361-
362-
// FIXME(macos): remove once the target in CI is updated
363-
"pthread_jit_write_freeze_callbacks_np" => true,
364-
365-
// FIXME(macos): ABI has been changed on recent macOSes.
366-
"os_unfair_lock_assert_owner" | "os_unfair_lock_assert_not_owner" => true,
367-
368-
// FIXME(macos): Once the SDK get updated to Ventura's level
369-
"freadlink" | "mknodat" | "mkfifoat" => true,
370-
371-
// FIXME(macos): Requires the macOS 14.4 SDK.
372-
"os_sync_wake_by_address_any"
373-
| "os_sync_wake_by_address_all"
374-
| "os_sync_wake_by_address_flags_t"
375-
| "os_sync_wait_on_address"
376-
| "os_sync_wait_on_address_flags_t"
377-
| "os_sync_wait_on_address_with_deadline"
378-
| "os_sync_wait_on_address_with_timeout" => true,
379-
380343
_ => false,
381344
}
382345
});
383346

384347
cfg.skip_struct_field(move |struct_, field| {
385348
match (struct_.ident(), field.ident()) {
386-
// FIXME(macos): the array size has been changed since macOS 10.15 ([8] -> [7]).
387-
("statfs", "f_reserved") => true,
388-
("__darwin_arm_neon_state64", "__v") => true,
389-
349+
// Anonymous ADT fields
390350
("ifreq", "ifr_ifru") => true,
391351
("in6_ifreq", "ifr_ifru") => true,
392352
("ifkpi", "ifk_data") => true,
@@ -426,8 +386,6 @@ fn test_apple(target: &str) {
426386
cfg.skip_roundtrip(move |s| match s {
427387
// FIXME(macos): this type has the wrong ABI
428388
"max_align_t" if i686 => true,
429-
// Can't return an array from a C function.
430-
"uuid_t" | "vol_capabilities_set_t" => true,
431389
_ => false,
432390
});
433391

0 commit comments

Comments
 (0)