Skip to content

Commit 6c15e7f

Browse files
author
Askar Safin
committed
Now we can remove workarounds for exec* from tests.
But for unknown reasons we still have to skip "fexecve" for Android
1 parent e77f551 commit 6c15e7f

File tree

1 file changed

+4
-33
lines changed

1 file changed

+4
-33
lines changed

libc-test/build.rs

Lines changed: 4 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -329,9 +329,6 @@ fn test_apple(target: &str) {
329329
cfg.skip_fn(move |name| {
330330
// skip those that are manually verified
331331
match name {
332-
// FIXME: https://github.com/rust-lang/libc/issues/1272
333-
"execv" | "execve" | "execvp" => true,
334-
335332
// close calls the close_nocancel system call
336333
"close" => true,
337334

@@ -525,9 +522,6 @@ fn test_openbsd(target: &str) {
525522

526523
cfg.skip_fn(move |name| {
527524
match name {
528-
// FIXME: https://github.com/rust-lang/libc/issues/1272
529-
"execv" | "execve" | "execvp" | "execvpe" => true,
530-
531525
// futex() has volatile arguments, but that doesn't exist in Rust.
532526
"futex" => true,
533527

@@ -694,14 +688,7 @@ fn test_windows(target: &str) {
694688
}
695689
});
696690

697-
cfg.skip_fn(move |name| {
698-
match name {
699-
// FIXME: https://github.com/rust-lang/libc/issues/1272
700-
"execv" | "execve" | "execvp" | "execvpe" => true,
701-
702-
_ => false,
703-
}
704-
});
691+
cfg.skip_fn(|_| false);
705692

706693
cfg.generate("../src/lib.rs", "main.rs");
707694
}
@@ -974,7 +961,7 @@ fn test_solarish(target: &str) {
974961
"cfmakeraw" | "cfsetspeed" => true,
975962

976963
// const-ness issues
977-
"execv" | "execve" | "execvp" | "settimeofday" | "sethostname" => true,
964+
"settimeofday" | "sethostname" => true,
978965

979966
// Solaris-different
980967
"getpwent_r" | "getgrent_r" | "updwtmpx" if is_illumos => true,
@@ -1182,8 +1169,6 @@ fn test_netbsd(target: &str) {
11821169

11831170
cfg.skip_fn(move |name| {
11841171
match name {
1185-
// FIXME: https://github.com/rust-lang/libc/issues/1272
1186-
"execv" | "execve" | "execvp" => true,
11871172
// FIXME: netbsd 10 minimum
11881173
"getentropy" | "getrandom" => true,
11891174

@@ -1411,9 +1396,6 @@ fn test_dragonflybsd(target: &str) {
14111396
cfg.skip_fn(move |name| {
14121397
// skip those that are manually verified
14131398
match name {
1414-
// FIXME: https://github.com/rust-lang/libc/issues/1272
1415-
"execv" | "execve" | "execvp" | "fexecve" => true,
1416-
14171399
"getrlimit" | "getrlimit64" | // non-int in 1st arg
14181400
"setrlimit" | "setrlimit64" | // non-int in 1st arg
14191401
"prlimit" | "prlimit64" // non-int in 2nd arg
@@ -1908,8 +1890,8 @@ fn test_android(target: &str) {
19081890
cfg.skip_fn(move |name| {
19091891
// skip those that are manually verified
19101892
match name {
1911-
// FIXME: https://github.com/rust-lang/libc/issues/1272
1912-
"execv" | "execve" | "execvp" | "execvpe" | "fexecve" => true,
1893+
// FIXME: for unknown reasons linker unable to find "fexecve"
1894+
"fexecve" => true,
19131895

19141896
// There are two versions of the sterror_r function, see
19151897
//
@@ -2487,9 +2469,6 @@ fn test_freebsd(target: &str) {
24872469
cfg.skip_fn(move |name| {
24882470
// skip those that are manually verified
24892471
match name {
2490-
// FIXME: https://github.com/rust-lang/libc/issues/1272
2491-
"execv" | "execve" | "execvp" | "execvpe" | "fexecve" => true,
2492-
24932472
// The `uname` function in the `utsname.h` FreeBSD header is a C
24942473
// inline function (has no symbol) that calls the `__xuname` symbol.
24952474
// Therefore the function pointer comparison does not make sense for it.
@@ -3089,9 +3068,6 @@ fn test_neutrino(target: &str) {
30893068
cfg.skip_fn(move |name| {
30903069
// skip those that are manually verified
30913070
match name {
3092-
// FIXME: https://github.com/rust-lang/libc/issues/1272
3093-
"execv" | "execve" | "execvp" | "execvpe" => true,
3094-
30953071
// wrong signature
30963072
"signal" => true,
30973073

@@ -4168,9 +4144,6 @@ fn test_linux(target: &str) {
41684144
cfg.skip_fn(move |name| {
41694145
// skip those that are manually verified
41704146
match name {
4171-
// FIXME: https://github.com/rust-lang/libc/issues/1272
4172-
"execv" | "execve" | "execvp" | "execvpe" | "fexecve" => true,
4173-
41744147
// There are two versions of the sterror_r function, see
41754148
//
41764149
// https://linux.die.net/man/3/strerror_r
@@ -4761,8 +4734,6 @@ fn test_haiku(target: &str) {
47614734
cfg.skip_fn(move |name| {
47624735
// skip those that are manually verified
47634736
match name {
4764-
// FIXME: https://github.com/rust-lang/libc/issues/1272
4765-
"execv" | "execve" | "execvp" | "execvpe" => true,
47664737
// FIXME: does not exist on haiku
47674738
"open_wmemstream" => true,
47684739
"mlockall" | "munlockall" => true,

0 commit comments

Comments
 (0)