Skip to content

Commit 7d8a284

Browse files
committed
Auto merge of #3455 - pfmooney:illumos-tests, r=JohnTitor
Fix libc-tests for illumos/solaris target This brings the tests back to passing on modern illumos machines.
2 parents 3195caf + 7cdb213 commit 7d8a284

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

libc-test/build.rs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1008,6 +1008,10 @@ fn test_solarish(target: &str) {
10081008
"madvise" | "mprotect" if is_illumos => true,
10091009
"door_call" | "door_return" | "door_create" if is_illumos => true,
10101010

1011+
// The compat functions use these "native" functions linked to their
1012+
// non-prefixed implementations in libc.
1013+
"native_getpwent_r" | "native_getgrent_r" => true,
1014+
10111015
// Not visible when build with _XOPEN_SOURCE=700
10121016
"mmapobj" | "mmap64" | "meminfo" | "getpagesizes" | "getpagesizes2" => true,
10131017

@@ -1016,6 +1020,12 @@ fn test_solarish(target: &str) {
10161020
// value is not useful (always 0) so we can ignore it:
10171021
"setservent" | "endservent" if is_illumos => true,
10181022

1023+
// Following illumos#3729, getifaddrs was changed to a
1024+
// redefine_extname symbol in order to preserve compatibility.
1025+
// Until better symbol binding story is figured out, it must be
1026+
// excluded from the tests.
1027+
"getifaddrs" if is_illumos => true,
1028+
10191029
_ => false,
10201030
}
10211031
});

src/unix/solarish/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3203,9 +3203,9 @@ extern "C" {
32033203

32043204
pub fn sync();
32053205

3206-
fn __major(version: ::c_int, devnum: ::dev_t) -> ::major_t;
3207-
fn __minor(version: ::c_int, devnum: ::dev_t) -> ::minor_t;
3208-
fn __makedev(version: ::c_int, majdev: ::major_t, mindev: ::minor_t) -> ::dev_t;
3206+
pub fn __major(version: ::c_int, devnum: ::dev_t) -> ::major_t;
3207+
pub fn __minor(version: ::c_int, devnum: ::dev_t) -> ::minor_t;
3208+
pub fn __makedev(version: ::c_int, majdev: ::major_t, mindev: ::minor_t) -> ::dev_t;
32093209
}
32103210

32113211
#[link(name = "sendfile")]

0 commit comments

Comments
 (0)