Skip to content

Commit 99f7e2f

Browse files
committed
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.
2 parents b82289f + 098cb7e commit 99f7e2f

File tree

11 files changed

+128
-14
lines changed

11 files changed

+128
-14
lines changed

libc-test/build.rs

100755100644
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3321,6 +3321,9 @@ fn test_haiku(target: &str) {
33213321
// is sized as the _POSIX_MAX_PATH, so that path names will fit in
33223322
// newly allocated dirent objects. This breaks the automated tests.
33233323
"dirent" => true,
3324+
// The following structs contain function pointers, which cannot be initialized
3325+
// with mem::zeroed(), so skip the automated test
3326+
"image_info" | "thread_info" => true,
33243327

33253328
_ => false,
33263329
}
@@ -3354,6 +3357,9 @@ fn test_haiku(target: &str) {
33543357
"mlock" | "munlock" => true,
33553358
// returns const char * on Haiku
33563359
"strsignal" => true,
3360+
// uses an enum as a parameter argument, which is incorrectly
3361+
// translated into a struct argument
3362+
"find_path" => true,
33573363

33583364
_ => false,
33593365
}

libc-test/semver/apple.txt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@ ENOLINK
224224
ENOPOLICY
225225
ENOSR
226226
ENOSTR
227+
ENOTBLK
227228
ENOTRECOVERABLE
228229
ENOTSUP
229230
EOF
@@ -238,9 +239,13 @@ ERA
238239
ERA_D_FMT
239240
ERA_D_T_FMT
240241
ERA_T_FMT
242+
EREMOTE
241243
ERPCMISMATCH
242244
ESHLIBVERS
245+
ESOCKTNOSUPPORT
243246
ETIME
247+
ETOOMANYREFS
248+
EUSERS
244249
EVFILT_AIO
245250
EVFILT_FS
246251
EVFILT_MACHPORT
@@ -365,6 +370,7 @@ IFF_PROMISC
365370
IFF_RUNNING
366371
IFF_SIMPLEX
367372
IFF_UP
373+
IMAXBEL
368374
INIT_PROCESS
369375
IOV_MAX
370376
IPC_CREAT
@@ -868,6 +874,7 @@ OFILL
868874
OLD_TIME
869875
ONOEOT
870876
OXTABS
877+
O_ASYNC
871878
O_DSYNC
872879
O_EXLOCK
873880
O_FSYNC
@@ -1123,6 +1130,7 @@ SIGEV_NONE
11231130
SIGEV_SIGNAL
11241131
SIGEV_THREAD
11251132
SIGINFO
1133+
SIGIO
11261134
SIGNATURE
11271135
SIGSTKSZ
11281136
SIOCGIFADDR
@@ -1329,7 +1337,9 @@ UTIME_NOW
13291337
UTIME_OMIT
13301338
UTUN_OPT_FLAGS
13311339
UTUN_OPT_IFNAME
1340+
VDISCARD
13321341
VDSUSP
1342+
VLNEXT
13331343
VM_FLAGS_ALIAS_MASK
13341344
VM_FLAGS_ANYWHERE
13351345
VM_FLAGS_FIXED
@@ -1425,10 +1435,12 @@ VM_PROT_NONE
14251435
VM_PROT_READ
14261436
VM_PROT_WRITE
14271437
VM_SWAPUSAGE
1438+
VREPRINT
14281439
VSTATUS
14291440
VT0
14301441
VT1
14311442
VTDLY
1443+
VWERASE
14321444
WEXITED
14331445
WNOWAIT
14341446
WSTOPPED
@@ -1490,6 +1502,7 @@ _SC_IOV_MAX
14901502
_SC_IPV6
14911503
_SC_JOB_CONTROL
14921504
_SC_LINE_MAX
1505+
_SC_LOGIN_NAME_MAX
14931506
_SC_MAPPED_FILES
14941507
_SC_MEMLOCK
14951508
_SC_MEMLOCK_RANGE
@@ -1507,6 +1520,7 @@ _SC_PRIORITY_SCHEDULING
15071520
_SC_RAW_SOCKETS
15081521
_SC_READER_WRITER_LOCKS
15091522
_SC_REALTIME_SIGNALS
1523+
_SC_RE_DUP_MAX
15101524
_SC_REGEXP
15111525
_SC_RTSIG_MAX
15121526
_SC_SAVED_IDS

libc-test/semver/dragonfly.txt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,7 @@ ENEEDAUTH
219219
ENOATTR
220220
ENOLINK
221221
ENOMEDIUM
222+
ENOTBLK
222223
ENOTSUP
223224
EOF
224225
EPROCLIM
@@ -229,7 +230,11 @@ ERA
229230
ERA_D_FMT
230231
ERA_D_T_FMT
231232
ERA_T_FMT
233+
EREMOTE
232234
ERPCMISMATCH
235+
ESOCKTNOSUPPORT
236+
ETOOMANYREFS
237+
EUSERS
233238
EVFILT_AIO
234239
EVFILT_EXCEPT
235240
EVFILT_FS
@@ -339,6 +344,7 @@ IFF_SIMPLEX
339344
IFF_SMART
340345
IFF_STATICARP
341346
IFF_UP
347+
IMAXBEL
342348
INIT_PROCESS
343349
IOV_MAX
344350
IPC_CREAT
@@ -669,6 +675,7 @@ NTP_API
669675
OLD_TIME
670676
ONOEOT
671677
OXTABS
678+
O_ASYNC
672679
O_DIRECT
673680
O_EXLOCK
674681
O_FSYNC
@@ -852,6 +859,7 @@ SIGEV_NONE
852859
SIGEV_SIGNAL
853860
SIGEV_THREAD
854861
SIGINFO
862+
SIGIO
855863
SIGNATURE
856864
SIGSTKSZ
857865
SIOCGIFADDR
@@ -1013,9 +1021,13 @@ UTX_DB_LASTLOG
10131021
UTX_DB_UTMPX
10141022
UTX_DB_WTMPX
10151023
VCHECKPT
1024+
VDISCARD
10161025
VDSUSP
10171026
VERASE2
1027+
VLNEXT
1028+
VREPRINT
10181029
VSTATUS
1030+
VWERASE
10191031
WEXITED
10201032
WNOWAIT
10211033
WSTOPPED
@@ -1085,6 +1097,7 @@ _SC_IOV_MAX
10851097
_SC_IPV6
10861098
_SC_JOB_CONTROL
10871099
_SC_LINE_MAX
1100+
_SC_LOGIN_NAME_MAX
10881101
_SC_MAPPED_FILES
10891102
_SC_MEMLOCK
10901103
_SC_MEMLOCK_RANGE
@@ -1100,6 +1113,7 @@ _SC_PRIORITIZED_IO
11001113
_SC_PRIORITY_SCHEDULING
11011114
_SC_RAW_SOCKETS
11021115
_SC_READER_WRITER_LOCKS
1116+
_SC_RE_DUP_MAX
11031117
_SC_REALTIME_SIGNALS
11041118
_SC_REGEXP
11051119
_SC_RTSIG_MAX

libc-test/semver/freebsd.txt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ EMULTIHOP
222222
ENEEDAUTH
223223
ENOATTR
224224
ENOLINK
225+
ENOTBLK
225226
ENOTCAPABLE
226227
ENOTRECOVERABLE
227228
ENOTSUP
@@ -235,7 +236,11 @@ ERA
235236
ERA_D_FMT
236237
ERA_D_T_FMT
237238
ERA_T_FMT
239+
EREMOTE
238240
ERPCMISMATCH
241+
ESOCKTNOSUPPORT
242+
ETOOMANYREFS
243+
EUSERS
239244
EVFILT_AIO
240245
EVFILT_EMPTY
241246
EVFILT_FS
@@ -365,6 +370,7 @@ IFF_RUNNING
365370
IFF_SIMPLEX
366371
IFF_STATICARP
367372
IFF_UP
373+
IMAXBEL
368374
INIT_PROCESS
369375
IOV_MAX
370376
IPC_CREAT
@@ -752,6 +758,7 @@ NTP_API
752758
OLD_TIME
753759
ONOEOT
754760
OXTABS
761+
O_ASYNC
755762
O_DIRECT
756763
O_EXEC
757764
O_EXLOCK
@@ -1019,6 +1026,7 @@ SIGEV_SIGNAL
10191026
SIGEV_THREAD
10201027
SIGEV_THREAD_ID
10211028
SIGINFO
1029+
SIGIO
10221030
SIGSTKSZ
10231031
SIOCGIFADDR
10241032
SLIPDISC
@@ -1199,9 +1207,13 @@ UTIME_OMIT
11991207
UTXDB_ACTIVE
12001208
UTXDB_LASTLOGIN
12011209
UTXDB_LOG
1210+
VDISCARD
12021211
VDSUSP
12031212
VERASE2
1213+
VLNEXT
12041214
VSTATUS
1215+
VREPRINT
1216+
VWERASE
12051217
WEXITED
12061218
WNOWAIT
12071219
WSTOPPED
@@ -1271,6 +1283,7 @@ _SC_IOV_MAX
12711283
_SC_IPV6
12721284
_SC_JOB_CONTROL
12731285
_SC_LINE_MAX
1286+
_SC_LOGIN_NAME_MAX
12741287
_SC_MAPPED_FILES
12751288
_SC_MEMLOCK
12761289
_SC_MEMLOCK_RANGE
@@ -1288,6 +1301,7 @@ _SC_RAW_SOCKETS
12881301
_SC_READER_WRITER_LOCKS
12891302
_SC_REALTIME_SIGNALS
12901303
_SC_REGEXP
1304+
_SC_RE_DUP_MAX
12911305
_SC_RTSIG_MAX
12921306
_SC_SAVED_IDS
12931307
_SC_SEMAPHORES

libc-test/semver/fuchsia.txt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,7 @@ ENONET
218218
ENOPKG
219219
ENOSR
220220
ENOSTR
221+
ENOTBLK
221222
ENOTNAM
222223
ENOTRECOVERABLE
223224
ENOTSUP
@@ -248,14 +249,18 @@ ERA_D_FMT
248249
ERA_D_T_FMT
249250
ERA_T_FMT
250251
EREMCHG
252+
EREMOTE
251253
EREMOTEIO
252254
ERESTART
253255
ERFKILL
256+
ESOCKTNOSUPPORT
254257
ESRMNT
255258
ESTRPIPE
256259
ETIME
260+
ETOOMANYREFS
257261
EUCLEAN
258262
EUNATCH
263+
EUSERS
259264
EXFULL
260265
EXTA
261266
EXTB
@@ -334,6 +339,7 @@ IFF_SLAVE
334339
IFF_TAP
335340
IFF_TUN
336341
IFF_UP
342+
IMAXBEL
337343
IPC_CREAT
338344
IPC_EXCL
339345
IPC_INFO
@@ -511,6 +517,7 @@ NOSTR
511517
OFDEL
512518
OFILL
513519
OLCUC
520+
O_ASYNC
514521
O_DIRECT
515522
O_DSYNC
516523
O_EXEC
@@ -829,6 +836,7 @@ SHM_W
829836
SIGEV_NONE
830837
SIGEV_SIGNAL
831838
SIGEV_THREAD
839+
SIGIO
832840
SIGPOLL
833841
SIGPWR
834842
SIGSTKFLT
@@ -976,9 +984,13 @@ T_FMT_AMPM
976984
UTIME_NOW
977985
UTIME_OMIT
978986
VSWTC
987+
VDISCARD
988+
VLNEXT
989+
VREPRINT
979990
VT0
980991
VT1
981992
VTDLY
993+
VWERASE
982994
WEXITED
983995
WNOWAIT
984996
WSTOPPED
@@ -1042,6 +1054,7 @@ _SC_IOV_MAX
10421054
_SC_IPV6
10431055
_SC_JOB_CONTROL
10441056
_SC_LINE_MAX
1057+
_SC_LOGIN_NAME_MAX
10451058
_SC_MAPPED_FILES
10461059
_SC_MEMLOCK
10471060
_SC_MEMLOCK_RANGE
@@ -1060,6 +1073,7 @@ _SC_PRIORITY_SCHEDULING
10601073
_SC_RAW_SOCKETS
10611074
_SC_READER_WRITER_LOCKS
10621075
_SC_REALTIME_SIGNALS
1076+
_SC_RE_DUP_MAX
10631077
_SC_REGEXP
10641078
_SC_RTSIG_MAX
10651079
_SC_SAVED_IDS

0 commit comments

Comments
 (0)