Auto merge of #2354 - nielx:haiku/fix-tests, r=JohnTitor

Haiku/fix tests This modifies the semver tests to reduce the symbols in the unix platform to what Haiku supports. I have added the symbols to the platforms that inherit the unix symbols, but I could do with a double check that I did not miss any.
rust-lang · Aug 20, 2021 · 99f7e2f · 99f7e2f
2 parents b82289f + 098cb7e
commit 99f7e2f
Show file tree

Hide file tree

Showing 11 changed files with 128 additions and 14 deletions.
diff --git a/libc-test/build.rs b/libc-test/build.rs
@@ -3321,6 +3321,9 @@ fn test_haiku(target: &str) {
             // is sized as the _POSIX_MAX_PATH, so that path names will fit in
             // newly allocated dirent objects. This breaks the automated tests.
             "dirent" => true,
+            // The following structs contain function pointers, which cannot be initialized
+            // with mem::zeroed(), so skip the automated test
+            "image_info" | "thread_info" => true,
 
             _ => false,
         }
@@ -3354,6 +3357,9 @@ fn test_haiku(target: &str) {
             "mlock" | "munlock" => true,
             // returns const char * on Haiku
             "strsignal" => true,
+            // uses an enum as a parameter argument, which is incorrectly
+            // translated into a struct argument
+            "find_path" => true,
 
             _ => false,
         }

diff --git a/libc-test/semver/apple.txt b/libc-test/semver/apple.txt
@@ -224,6 +224,7 @@ ENOLINK
 ENOPOLICY
 ENOSR
 ENOSTR
+ENOTBLK
 ENOTRECOVERABLE
 ENOTSUP
 EOF
@@ -238,9 +239,13 @@ ERA
 ERA_D_FMT
 ERA_D_T_FMT
 ERA_T_FMT
+EREMOTE
 ERPCMISMATCH
 ESHLIBVERS
+ESOCKTNOSUPPORT
 ETIME
+ETOOMANYREFS
+EUSERS
 EVFILT_AIO
 EVFILT_FS
 EVFILT_MACHPORT
@@ -365,6 +370,7 @@ IFF_PROMISC
 IFF_RUNNING
 IFF_SIMPLEX
 IFF_UP
+IMAXBEL
 INIT_PROCESS
 IOV_MAX
 IPC_CREAT
@@ -868,6 +874,7 @@ OFILL
 OLD_TIME
 ONOEOT
 OXTABS
+O_ASYNC
 O_DSYNC
 O_EXLOCK
 O_FSYNC
@@ -1123,6 +1130,7 @@ SIGEV_NONE
 SIGEV_SIGNAL
 SIGEV_THREAD
 SIGINFO
+SIGIO
 SIGNATURE
 SIGSTKSZ
 SIOCGIFADDR
@@ -1329,7 +1337,9 @@ UTIME_NOW
 UTIME_OMIT
 UTUN_OPT_FLAGS
 UTUN_OPT_IFNAME
+VDISCARD
 VDSUSP
+VLNEXT
 VM_FLAGS_ALIAS_MASK
 VM_FLAGS_ANYWHERE
 VM_FLAGS_FIXED
@@ -1425,10 +1435,12 @@ VM_PROT_NONE
 VM_PROT_READ
 VM_PROT_WRITE
 VM_SWAPUSAGE
+VREPRINT
 VSTATUS
 VT0
 VT1
 VTDLY
+VWERASE
 WEXITED
 WNOWAIT
 WSTOPPED
@@ -1490,6 +1502,7 @@ _SC_IOV_MAX
 _SC_IPV6
 _SC_JOB_CONTROL
 _SC_LINE_MAX
+_SC_LOGIN_NAME_MAX
 _SC_MAPPED_FILES
 _SC_MEMLOCK
 _SC_MEMLOCK_RANGE
@@ -1507,6 +1520,7 @@ _SC_PRIORITY_SCHEDULING
 _SC_RAW_SOCKETS
 _SC_READER_WRITER_LOCKS
 _SC_REALTIME_SIGNALS
+_SC_RE_DUP_MAX
 _SC_REGEXP
 _SC_RTSIG_MAX
 _SC_SAVED_IDS

diff --git a/libc-test/semver/dragonfly.txt b/libc-test/semver/dragonfly.txt
@@ -219,6 +219,7 @@ ENEEDAUTH
 ENOATTR
 ENOLINK
 ENOMEDIUM
+ENOTBLK
 ENOTSUP
 EOF
 EPROCLIM
@@ -229,7 +230,11 @@ ERA
 ERA_D_FMT
 ERA_D_T_FMT
 ERA_T_FMT
+EREMOTE
 ERPCMISMATCH
+ESOCKTNOSUPPORT
+ETOOMANYREFS
+EUSERS
 EVFILT_AIO
 EVFILT_EXCEPT
 EVFILT_FS
@@ -339,6 +344,7 @@ IFF_SIMPLEX
 IFF_SMART
 IFF_STATICARP
 IFF_UP
+IMAXBEL
 INIT_PROCESS
 IOV_MAX
 IPC_CREAT
@@ -669,6 +675,7 @@ NTP_API
 OLD_TIME
 ONOEOT
 OXTABS
+O_ASYNC
 O_DIRECT
 O_EXLOCK
 O_FSYNC
@@ -852,6 +859,7 @@ SIGEV_NONE
 SIGEV_SIGNAL
 SIGEV_THREAD
 SIGINFO
+SIGIO
 SIGNATURE
 SIGSTKSZ
 SIOCGIFADDR
@@ -1013,9 +1021,13 @@ UTX_DB_LASTLOG
 UTX_DB_UTMPX
 UTX_DB_WTMPX
 VCHECKPT
+VDISCARD
 VDSUSP
 VERASE2
+VLNEXT
+VREPRINT
 VSTATUS
+VWERASE
 WEXITED
 WNOWAIT
 WSTOPPED
@@ -1085,6 +1097,7 @@ _SC_IOV_MAX
 _SC_IPV6
 _SC_JOB_CONTROL
 _SC_LINE_MAX
+_SC_LOGIN_NAME_MAX
 _SC_MAPPED_FILES
 _SC_MEMLOCK
 _SC_MEMLOCK_RANGE
@@ -1100,6 +1113,7 @@ _SC_PRIORITIZED_IO
 _SC_PRIORITY_SCHEDULING
 _SC_RAW_SOCKETS
 _SC_READER_WRITER_LOCKS
+_SC_RE_DUP_MAX
 _SC_REALTIME_SIGNALS
 _SC_REGEXP
 _SC_RTSIG_MAX

diff --git a/libc-test/semver/freebsd.txt b/libc-test/semver/freebsd.txt
@@ -222,6 +222,7 @@ EMULTIHOP
 ENEEDAUTH
 ENOATTR
 ENOLINK
+ENOTBLK
 ENOTCAPABLE
 ENOTRECOVERABLE
 ENOTSUP
@@ -235,7 +236,11 @@ ERA
 ERA_D_FMT
 ERA_D_T_FMT
 ERA_T_FMT
+EREMOTE
 ERPCMISMATCH
+ESOCKTNOSUPPORT
+ETOOMANYREFS
+EUSERS
 EVFILT_AIO
 EVFILT_EMPTY
 EVFILT_FS
@@ -365,6 +370,7 @@ IFF_RUNNING
 IFF_SIMPLEX
 IFF_STATICARP
 IFF_UP
+IMAXBEL
 INIT_PROCESS
 IOV_MAX
 IPC_CREAT
@@ -752,6 +758,7 @@ NTP_API
 OLD_TIME
 ONOEOT
 OXTABS
+O_ASYNC
 O_DIRECT
 O_EXEC
 O_EXLOCK
@@ -1019,6 +1026,7 @@ SIGEV_SIGNAL
 SIGEV_THREAD
 SIGEV_THREAD_ID
 SIGINFO
+SIGIO
 SIGSTKSZ
 SIOCGIFADDR
 SLIPDISC
@@ -1199,9 +1207,13 @@ UTIME_OMIT
 UTXDB_ACTIVE
 UTXDB_LASTLOGIN
 UTXDB_LOG
+VDISCARD
 VDSUSP
 VERASE2
+VLNEXT
 VSTATUS
+VREPRINT
+VWERASE
 WEXITED
 WNOWAIT
 WSTOPPED
@@ -1271,6 +1283,7 @@ _SC_IOV_MAX
 _SC_IPV6
 _SC_JOB_CONTROL
 _SC_LINE_MAX
+_SC_LOGIN_NAME_MAX
 _SC_MAPPED_FILES
 _SC_MEMLOCK
 _SC_MEMLOCK_RANGE
@@ -1288,6 +1301,7 @@ _SC_RAW_SOCKETS
 _SC_READER_WRITER_LOCKS
 _SC_REALTIME_SIGNALS
 _SC_REGEXP
+_SC_RE_DUP_MAX
 _SC_RTSIG_MAX
 _SC_SAVED_IDS
 _SC_SEMAPHORES

diff --git a/libc-test/semver/fuchsia.txt b/libc-test/semver/fuchsia.txt
@@ -218,6 +218,7 @@ ENONET
 ENOPKG
 ENOSR
 ENOSTR
+ENOTBLK
 ENOTNAM
 ENOTRECOVERABLE
 ENOTSUP
@@ -248,14 +249,18 @@ ERA_D_FMT
 ERA_D_T_FMT
 ERA_T_FMT
 EREMCHG
+EREMOTE
 EREMOTEIO
 ERESTART
 ERFKILL
+ESOCKTNOSUPPORT
 ESRMNT
 ESTRPIPE
 ETIME
+ETOOMANYREFS
 EUCLEAN
 EUNATCH
+EUSERS
 EXFULL
 EXTA
 EXTB
@@ -334,6 +339,7 @@ IFF_SLAVE
 IFF_TAP
 IFF_TUN
 IFF_UP
+IMAXBEL
 IPC_CREAT
 IPC_EXCL
 IPC_INFO
@@ -511,6 +517,7 @@ NOSTR
 OFDEL
 OFILL
 OLCUC
+O_ASYNC
 O_DIRECT
 O_DSYNC
 O_EXEC
@@ -829,6 +836,7 @@ SHM_W
 SIGEV_NONE
 SIGEV_SIGNAL
 SIGEV_THREAD
+SIGIO
 SIGPOLL
 SIGPWR
 SIGSTKFLT
@@ -976,9 +984,13 @@ T_FMT_AMPM
 UTIME_NOW
 UTIME_OMIT
 VSWTC
+VDISCARD
+VLNEXT
+VREPRINT
 VT0
 VT1
 VTDLY
+VWERASE
 WEXITED
 WNOWAIT
 WSTOPPED
@@ -1042,6 +1054,7 @@ _SC_IOV_MAX
 _SC_IPV6
 _SC_JOB_CONTROL
 _SC_LINE_MAX
+_SC_LOGIN_NAME_MAX
 _SC_MAPPED_FILES
 _SC_MEMLOCK
 _SC_MEMLOCK_RANGE
@@ -1060,6 +1073,7 @@ _SC_PRIORITY_SCHEDULING
 _SC_RAW_SOCKETS
 _SC_READER_WRITER_LOCKS
 _SC_REALTIME_SIGNALS
+_SC_RE_DUP_MAX
 _SC_REGEXP
 _SC_RTSIG_MAX
 _SC_SAVED_IDS