OpenE2K/libc-rs
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix musl build jobs

Browse Source
This commit is contained in:
gnzlbg 2019-05-23 19:09:39 +02:00
parent cc13d7506e
commit ccad8b426c
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libc-test/build.rs
View File

@ -1444,7 +1444,7 @@ fn test_android(target: &str) {
// `linux/fcntl.h` and `fcntl.h` fails. // `linux/fcntl.h` and `fcntl.h` fails.
// //
// This also tests strerror_r. // This also tests strerror_r.
test_linux_termios2(); test_linux_termios2(target);
} }
fn test_freebsd(target: &str) { fn test_freebsd(target: &str) {
@ -2660,7 +2660,7 @@ fn test_linux(target: &str) {
// On Linux also generate another script for testing linux/fcntl declarations. // On Linux also generate another script for testing linux/fcntl declarations.
// These cannot be tested normally because including both `linux/fcntl.h` and `fcntl.h` // These cannot be tested normally because including both `linux/fcntl.h` and `fcntl.h`
// fails on a lot of platforms. // fails on a lot of platforms.
test_linux_termios2(); test_linux_termios2(target);
// Test Elf64_Phdr and Elf32_Phdr // Test Elf64_Phdr and Elf32_Phdr
// These types have a field called `p_type`, but including // These types have a field called `p_type`, but including
@ -2683,7 +2683,9 @@ fn test_linux(target: &str) {
cfg.generate("../src/lib.rs", "linux_elf.rs"); cfg.generate("../src/lib.rs", "linux_elf.rs");
} }
fn test_linux_termios2() { fn test_linux_termios2(target: &str) {
assert!(target.contains("linux") || target.contains("android"));
let musl = target.contains("musl");
let mut cfg = ctest::TestGenerator::new(); let mut cfg = ctest::TestGenerator::new();
cfg.skip_type(|_| true) cfg.skip_type(|_| true)
.skip_fn(|f| match f { .skip_fn(|f| match f {
@ -2693,13 +2695,20 @@ fn test_linux_termios2() {
.skip_static(|_| true); .skip_static(|_| true);
headers! { headers! {
cfg: cfg:
"linux/fcntl.h",
"net/if.h",
"linux/if.h",
"linux/quota.h", "linux/quota.h",
"asm/termbits.h", "asm/termbits.h",
"string.h" "string.h"
} }
if musl {
cfg.header("fcntl.h");
} else {
cfg.header("linux/fcntl.h");
}
if !musl {
cfg.header("net/if.h");
cfg.header("linux/if.h");
}
cfg.skip_const(move |name| match name { cfg.skip_const(move |name| match name {
"F_CANCELLK" | "F_ADD_SEALS" | "F_GET_SEALS" => false, "F_CANCELLK" | "F_ADD_SEALS" | "F_GET_SEALS" => false,
"F_SEAL_SEAL" | "F_SEAL_SHRINK" | "F_SEAL_GROW" | "F_SEAL_WRITE" => { "F_SEAL_SEAL" | "F_SEAL_SHRINK" | "F_SEAL_GROW" | "F_SEAL_WRITE" => {