Skip to content

Commit e7bcb7a

Browse files
committed
Re-enable all roundtrip tests
1 parent 9b936e3 commit e7bcb7a

File tree

1 file changed

+5
-49
lines changed

1 file changed

+5
-49
lines changed

libc-test/build.rs

+5-49
Original file line numberDiff line numberDiff line change
@@ -225,12 +225,6 @@ fn test_apple(target: &str) {
225225
}
226226
});
227227

228-
cfg.skip_roundtrip(move |s| match s {
229-
// FIXME: TODO
230-
"utsname" | "statfs" | "dirent" | "utmpx" => true,
231-
_ => false,
232-
});
233-
234228
cfg.generate("../src/lib.rs", "main.rs");
235229
}
236230

@@ -370,11 +364,6 @@ fn test_openbsd(target: &str) {
370364
(struct_ == "siginfo_t" && field == "si_addr")
371365
});
372366

373-
cfg.skip_roundtrip(move |s| match s {
374-
"dirent" | "utsname" | "utmp" => true,
375-
_ => false,
376-
});
377-
378367
cfg.generate("../src/lib.rs", "main.rs");
379368
}
380369

@@ -479,11 +468,6 @@ fn test_windows(target: &str) {
479468
}
480469
});
481470

482-
cfg.skip_roundtrip(move |s| match s {
483-
"dirent" | "statfs" | "utsname" | "utmpx" => true,
484-
_ => false,
485-
});
486-
487471
cfg.generate("../src/lib.rs", "main.rs");
488472
}
489473

@@ -1438,13 +1422,6 @@ fn test_android(target: &str) {
14381422
field == "ssi_arch"))
14391423
});
14401424

1441-
let bit64 = target.contains("64");
1442-
cfg.skip_roundtrip(move |s| match s {
1443-
"utsname" | "dirent" | "dirent64" => true,
1444-
"utmp" if bit64 => true,
1445-
_ => false,
1446-
});
1447-
14481425
cfg.generate("../src/lib.rs", "main.rs");
14491426

14501427
test_linux_like_apis(target);
@@ -1648,11 +1625,6 @@ fn test_freebsd(target: &str) {
16481625
(struct_ == "sigaction" && field == "sa_sigaction")
16491626
});
16501627

1651-
cfg.skip_roundtrip(move |s| match s {
1652-
"dirent" | "statfs" | "utsname" | "utmpx" => true,
1653-
_ => false,
1654-
});
1655-
16561628
cfg.generate("../src/lib.rs", "main.rs");
16571629
}
16581630

@@ -1857,15 +1829,6 @@ fn test_emscripten(target: &str) {
18571829
field == "ssi_arch"))
18581830
});
18591831

1860-
cfg.skip_roundtrip(move |s| match s {
1861-
"pthread_mutexattr_t"
1862-
| "utsname"
1863-
| "dirent"
1864-
| "dirent64"
1865-
| "sysinfo" => true,
1866-
_ => false,
1867-
});
1868-
18691832
// FIXME: test linux like
18701833
cfg.generate("../src/lib.rs", "main.rs");
18711834
}
@@ -2291,17 +2254,11 @@ fn test_linux(target: &str) {
22912254
});
22922255

22932256
cfg.skip_roundtrip(move |s| match s {
2294-
// FIXME: TODO
2295-
"_libc_fpstate" | "user_fpregs_struct" if x86_64 => true,
2296-
"utsname"
2297-
| "statx"
2298-
| "dirent"
2299-
| "dirent64"
2300-
| "utmpx"
2301-
| "user"
2302-
| "user_fpxregs_struct" => true,
2303-
"sysinfo" if musl => true,
2304-
"ucontext_t" if x86_64 && musl => true,
2257+
// FIXME:
2258+
"utsname" if mips32 || mips64 => true,
2259+
// FIXME:
2260+
"mcontext_t" if s390x => true,
2261+
23052262
"sockaddr_un" | "sembuf" | "ff_constant_effect"
23062263
if mips32 && (gnu || musl) =>
23072264
{
@@ -2328,7 +2285,6 @@ fn test_linux(target: &str) {
23282285
{
23292286
true
23302287
}
2331-
"mcontext_t" if s390x => true,
23322288

23332289
_ => false,
23342290
});

0 commit comments

Comments
 (0)