Skip to content

Commit 3fd4dd7

Browse files
committed
Silence roundtrip errors
1 parent b81a234 commit 3fd4dd7

File tree

1 file changed

+49
-1
lines changed

1 file changed

+49
-1
lines changed

libc-test/build.rs

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1432,6 +1432,13 @@ fn test_android(target: &str) {
14321432
field == "ssi_arch"))
14331433
});
14341434

1435+
let bit64 = target.contains("64");
1436+
cfg.skip_roundtrip(move |s| match s {
1437+
"utsname" | "dirent" | "dirent64" => true,
1438+
"utmp" if bit64 => true,
1439+
_ => false,
1440+
});
1441+
14351442
cfg.generate("../src/lib.rs", "main.rs");
14361443

14371444
test_linux_like_apis(target);
@@ -1838,6 +1845,15 @@ fn test_emscripten(target: &str) {
18381845
field == "ssi_arch"))
18391846
});
18401847

1848+
cfg.skip_roundtrip(move |s| match s {
1849+
"pthread_mutexattr_t"
1850+
| "utsname"
1851+
| "dirent"
1852+
| "dirent64"
1853+
| "sysinfo" => true,
1854+
_ => false,
1855+
});
1856+
18411857
// FIXME: test linux like
18421858
cfg.generate("../src/lib.rs", "main.rs");
18431859
}
@@ -1865,8 +1881,11 @@ fn test_linux(target: &str) {
18651881
let x86_32 = target.contains("i686");
18661882
let x32 = target.contains("x32");
18671883
let mips = target.contains("mips");
1868-
let mips32_musl = mips && !target.contains("64") && musl;
1884+
let mips32 = mips && !target.contains("64");
1885+
let mips64 = mips && target.contains("64");
1886+
let mips32_musl = mips32 && musl;
18691887
let sparc64 = target.contains("sparc64");
1888+
let s390x = target.contains("s390x");
18701889

18711890
let mut cfg = ctest::TestGenerator::new();
18721891
cfg.define("_GNU_SOURCE", None);
@@ -2269,6 +2288,35 @@ fn test_linux(target: &str) {
22692288
| "utmpx"
22702289
| "user"
22712290
| "user_fpxregs_struct" => true,
2291+
"sysinfo" if musl => true,
2292+
"sockaddr_un" | "sembuf" | "ff_constant_effect"
2293+
if mips32 && (gnu || musl) =>
2294+
{
2295+
true
2296+
}
2297+
"ipv6_mreq"
2298+
| "sockaddr_in6"
2299+
| "sockaddr_ll"
2300+
| "in_pktinfo"
2301+
| "arpreq"
2302+
| "arpreq_old"
2303+
| "sockaddr_un"
2304+
| "ff_constant_effect"
2305+
| "ff_ramp_effect"
2306+
| "ff_condition_effect"
2307+
| "Elf32_Ehdr"
2308+
| "Elf32_Chdr"
2309+
| "ucred"
2310+
| "in6_pktinfo"
2311+
| "sockaddr_nl"
2312+
| "termios"
2313+
| "nlmsgerr"
2314+
if (mips64 || sparc64) && gnu =>
2315+
{
2316+
true
2317+
}
2318+
"mcontext_t" if s390x => true,
2319+
22722320
_ => false,
22732321
});
22742322

0 commit comments

Comments
 (0)