Skip to content

Commit 4aaba6c

Browse files
committed
Auto merge of #2461 - rtzoeller:dfly_headers, r=JohnTitor
Fix most libc-test compile warnings and errors for DragonFly libc-test is failing on my DragonFly BSD system with a large number of errors, most of which are just a result of headers not being included. ``` [root@ ~/libc/libc-test]# uname -a DragonFly 6.0-RELEASE DragonFly v6.0.1-RELEASE #0: Wed Oct 13 21:06:17 CDT 2021 root@:/usr/obj/usr/src/sys/X86_64_GENERIC x86_64 [root@ ~/libc/libc-test]# cargo test 2>&1 >/dev/null | wc -l 6015 ``` Including a few additional headers, most of these warnings and errors are fixed: ``` [root@ ~/libc/libc-test]# cargo test 2>&1 >/dev/null | wc -l 561 ```
2 parents 133aeb8 + 0c4b6ed commit 4aaba6c

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

libc-test/build.rs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1176,8 +1176,10 @@ fn test_dragonflybsd(target: &str) {
11761176
"ifaddrs.h",
11771177
"langinfo.h",
11781178
"limits.h",
1179+
"link.h",
11791180
"locale.h",
11801181
"mqueue.h",
1182+
"net/bpf.h",
11811183
"net/if.h",
11821184
"net/if_arp.h",
11831185
"net/if_dl.h",
@@ -1206,8 +1208,10 @@ fn test_dragonflybsd(target: &str) {
12061208
"sys/ioctl.h",
12071209
"sys/ipc.h",
12081210
"sys/ktrace.h",
1211+
"sys/malloc.h",
12091212
"sys/mman.h",
12101213
"sys/mount.h",
1214+
"sys/procctl.h",
12111215
"sys/ptrace.h",
12121216
"sys/resource.h",
12131217
"sys/rtprio.h",
@@ -1219,6 +1223,7 @@ fn test_dragonflybsd(target: &str) {
12191223
"sys/sysctl.h",
12201224
"sys/time.h",
12211225
"sys/times.h",
1226+
"sys/timex.h",
12221227
"sys/types.h",
12231228
"sys/uio.h",
12241229
"sys/un.h",
@@ -1251,6 +1256,9 @@ fn test_dragonflybsd(target: &str) {
12511256

12521257
t if t.ends_with("_t") => t.to_string(),
12531258

1259+
// sigval is a struct in Rust, but a union in C:
1260+
"sigval" => format!("union sigval"),
1261+
12541262
// put `struct` in front of all structs:.
12551263
t if is_struct => format!("struct {}", t),
12561264

@@ -1284,9 +1292,6 @@ fn test_dragonflybsd(target: &str) {
12841292

12851293
cfg.skip_struct(move |ty| {
12861294
match ty {
1287-
// This is actually a union, not a struct
1288-
"sigval" => true,
1289-
12901295
// FIXME: These are tested as part of the linux_fcntl tests since
12911296
// there are header conflicts when including them with all the other
12921297
// structs.

0 commit comments

Comments
 (0)