Skip to content

Commit 3efe23b

Browse files
committed
Enable more tests on Android
1 parent 1c5a36c commit 3efe23b

File tree

1 file changed

+2
-14
lines changed

1 file changed

+2
-14
lines changed

libc-test/build.rs

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1414,31 +1414,19 @@ fn test_android(target: &str) {
14141414
}
14151415
});
14161416

1417-
// FIXME: still necessary?
14181417
cfg.skip_field_type(move |struct_, field| {
14191418
// This is a weird union, don't check the type.
14201419
(struct_ == "ifaddrs" && field == "ifa_ifu") ||
1421-
// sighandler_t type is super weird
1422-
(struct_ == "sigaction" && field == "sa_sigaction") ||
14231420
// sigval is actually a union, but we pretend it's a struct
1424-
(struct_ == "sigevent" && field == "sigev_value") ||
1425-
// aio_buf is "volatile void*" and Rust doesn't understand volatile
1426-
(struct_ == "aiocb" && field == "aio_buf")
1421+
(struct_ == "sigevent" && field == "sigev_value")
14271422
});
14281423

1429-
// FIXME: still necessary?
14301424
cfg.skip_field(move |struct_, field| {
14311425
// this is actually a union on linux, so we can't represent it well and
14321426
// just insert some padding.
14331427
(struct_ == "siginfo_t" && field == "_pad") ||
14341428
// sigev_notify_thread_id is actually part of a sigev_un union
1435-
(struct_ == "sigevent" && field == "sigev_notify_thread_id") ||
1436-
// signalfd had SIGSYS fields added in Linux 4.18, but no libc release has them yet.
1437-
(struct_ == "signalfd_siginfo" && (field == "ssi_addr_lsb" ||
1438-
field == "_pad2" ||
1439-
field == "ssi_syscall" ||
1440-
field == "ssi_call_addr" ||
1441-
field == "ssi_arch"))
1429+
(struct_ == "sigevent" && field == "sigev_notify_thread_id")
14421430
});
14431431

14441432
cfg.generate("../src/lib.rs", "main.rs");

0 commit comments

Comments
 (0)