Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix multiple symbol definitions on Android CI #2684

Merged
merged 1 commit into from
Feb 14, 2022
+25 −0
Merged

Fix multiple symbol definitions on Android CI #2684

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions libc-test/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1638,6 +1638,9 @@ fn test_android(target: &str) {
// FIXME: `sighandler_t` type is incorrect, see:
// https://github.com/rust-lang/libc/issues/1359
"sighandler_t" => true,

// These are tested in the `linux_elf.rs` file.
"Elf64_Phdr" | "Elf32_Phdr" => true,
_ => false,
}
});
Expand All @@ -1655,12 +1658,33 @@ fn test_android(target: &str) {
// 'private' type
"prop_info" => true,

// These are tested in the `linux_elf.rs` file.
"Elf64_Phdr" | "Elf32_Phdr" => true,

_ => false,
}
});

cfg.skip_const(move |name| {
match name {
// The IPV6 constants are tested in the `linux_ipv6.rs` tests:
| "IPV6_FLOWINFO"
| "IPV6_FLOWLABEL_MGR"
| "IPV6_FLOWINFO_SEND"
| "IPV6_FLOWINFO_FLOWLABEL"
| "IPV6_FLOWINFO_PRIORITY"
// The F_ fnctl constants are tested in the `linux_fnctl.rs` tests:
| "F_CANCELLK"
| "F_ADD_SEALS"
| "F_GET_SEALS"
| "F_SEAL_SEAL"
| "F_SEAL_SHRINK"
| "F_SEAL_GROW"
| "F_SEAL_WRITE" => true,

// The `ARPHRD_CAN` is tested in the `linux_if_arp.rs` tests:
"ARPHRD_CAN" => true,

// FIXME: deprecated: not available in any header
// See: https://github.com/rust-lang/libc/issues/1356
"ENOATTR" => true,
Expand All @@ -1678,6 +1702,7 @@ fn test_android(target: &str) {

// FIXME: conflicts with standard C headers and is tested in
// `linux_termios.rs` below:
"BOTHER" => true,
"IBSHIFT" => true,
"TCGETS2" | "TCSETS2" | "TCSETSW2" | "TCSETSF2" => true,

Expand Down