Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,7 @@ jobs:
target: x86_64-unknown-freebsd
- target: x86_64-pc-solaris
- target: x86_64-unknown-netbsd
- target: x86_64-unknown-illumos
timeout-minutes: 25
steps:
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
Expand Down Expand Up @@ -367,6 +368,27 @@ jobs:
rustc -Vv
./ci/run.sh ${{ matrix.target }}

- name: test on illumos
uses: vmactions/omnios-vm@7f2be0b927aad1a78498c8aeeac4c4ce1fabd322 # v1.3.3
if: contains(matrix.target, 'illumos')
with:
# Use the latest LTS
release: "r151054-build"
usesh: true
mem: 4096
copyback: false
prepare: |
set -ex
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- \
--profile minimal --default-toolchain nightly -y
uname -a
run: |
set -ex
. "$HOME/.cargo/env"
which rustc
rustc -Vv
./ci/run.sh ${{ matrix.target }}

ctest_msrv:
name: Check ctest MSRV
runs-on: ubuntu-26.04
Expand Down
13 changes: 12 additions & 1 deletion libc-test/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1052,7 +1052,7 @@ fn test_solarish(target: &str) {
);

if is_illumos {
headers!(cfg, "sys/epoll.h", "sys/eventfd.h",);
headers!(cfg, "sys/epoll.h", "sys/eventfd.h", "sys/timerfd.h",);
}

if is_solaris {
Expand Down Expand Up @@ -1084,6 +1084,8 @@ fn test_solarish(target: &str) {
// expose stat.Xtim.tv_nsec fields
Some(field.ident().trim_end_matches("e_nsec").to_string() + ".tv_nsec")
}
// epoll_event.data is a union in C; our `u64` field lives at `data.u64`
"epoll_event" if field.ident() == "u64" => Some("data.u64".to_string()),
_ => None,
}
});
Expand Down Expand Up @@ -1111,6 +1113,15 @@ fn test_solarish(target: &str) {
// explicitly support it. (A no-op is an acceptable implementation of EPOLLEXCLUSIVE.)
"EPOLLEXCLUSIVE" if is_illumos => true,

// FIXME(illumos)
// illumos has changed this constant, see https://www.illumos.org/issues/16200 for details.
// We would like to keep this header value in sync with what is present in the illumos
// sysroot that rustc is cross compiled with. There is an in progress bump in
// https://github.com/illumos/sysroot/pull/5, however this will still predate the new value.
// When this does eventually make it to the sysroot we should update it in this crate and
// remove this test skip.
"PTHREAD_MUTEX_DEFAULT" if is_illumos => true,

_ => false,
});

Expand Down