Disable MIPS in CI. (#793)

* Disable MIPS in CI. Enable check-only testing. * Unpin nightly. * Disable MIPS check tests too. * Mention `rusl` as another similar crate. * Fix a test on illumos.
bytecodealliance · Aug 25, 2023 · 0555568 · 0555568
1 parent 2250af4
commit 0555568
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 116 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -32,7 +32,7 @@ jobs:
             rust: stable
           - build: nightly
             os: ubuntu-latest
-            rust: nightly-2023-07-03
+            rust: nightly
           - build: 1.63
             os: ubuntu-latest
             rust: 1.63
@@ -70,8 +70,6 @@ jobs:
         aarch64-unknown-linux-gnu
         aarch64-unknown-linux-musl
         powerpc64le-unknown-linux-gnu
-        mipsel-unknown-linux-gnu
-        mips64el-unknown-linux-gnuabi64
         armv5te-unknown-linux-gnueabi
         s390x-unknown-linux-gnu
         arm-linux-androideabi
@@ -111,8 +109,6 @@ jobs:
     - run: cargo check --workspace --release -vv --target=aarch64-unknown-linux-musl --features=all-apis --all-targets
     - run: cargo check --workspace --release -vv --target=aarch64-unknown-linux-musl --features=use-libc,all-apis --all-targets
     - run: cargo check --workspace --release -vv --target=powerpc64le-unknown-linux-gnu --features=all-apis --all-targets
-    - run: cargo check --workspace --release -vv --target=mipsel-unknown-linux-gnu --features=all-apis --all-targets
-    - run: cargo check --workspace --release -vv --target=mips64el-unknown-linux-gnuabi64 --features=all-apis --all-targets
     - run: cargo check --workspace --release -vv --target=armv5te-unknown-linux-gnueabi --features=all-apis --all-targets
     - run: cargo check --workspace --release -vv --target=s390x-unknown-linux-gnu --features=all-apis --all-targets
     - run: cargo check --workspace --release -vv --target=arm-linux-androideabi --features=all-apis --all-targets
@@ -131,7 +127,7 @@ jobs:
         include:
           - build: nightly
             os: ubuntu-latest
-            rust: nightly-2023-07-03
+            rust: nightly
 
     env:
       # -D warnings is commented out in our install-rust action; re-add it here.
@@ -161,7 +157,7 @@ jobs:
         include:
           - build: nightly
             os: ubuntu-latest
-            rust: nightly-2023-07-03
+            rust: nightly
 
     steps:
     - uses: actions/checkout@v3
@@ -188,7 +184,7 @@ jobs:
         include:
           - build: nightly
             os: ubuntu-latest
-            rust: nightly-2023-07-03
+            rust: nightly
 
     steps:
     - uses: actions/checkout@v3
@@ -215,6 +211,10 @@ jobs:
     - run: cargo check -Z build-std --target=riscv32imc-esp-espidf --features=all-apis
     - run: cargo check -Z build-std --target=aarch64-unknown-nto-qnx710 --features=all-apis
     - run: cargo check -Z build-std --target=x86_64-pc-nto-qnx710 --features=all-apis
+    # Disable MIPS entirely for now as it fails with errors like
+    # "Undefined temporary symbol $BB342_17".
+    #- run: cargo check -Z build-std --target=mipsel-unknown-linux-gnu --features=all-apis
+    #- run: cargo check -Z build-std --target=mips64el-unknown-linux-gnuabi64 --features=all-apis
 
   test:
     name: Test
@@ -225,24 +225,24 @@ jobs:
       RUSTFLAGS: --cfg rustix_use_experimental_features
     strategy:
       matrix:
-        build: [ubuntu, ubuntu-20.04, i686-linux, aarch64-linux, powerpc64le-linux, riscv64-linux, s390x-linux, arm-linux, ubuntu-stable, ubuntu-1.63, i686-linux-stable, aarch64-linux-stable, riscv64-linux-stable, s390x-linux-stable, mipsel-linux-stable, mips64el-linux-stable, powerpc64le-linux-stable, arm-linux-stable, ubuntu-1.63, i686-linux-1.63, aarch64-linux-1.63, riscv64-linux-1.63, s390x-linux-1.63, mipsel-linux-1.63, mips64el-linux-1.63, powerpc64le-linux-1.63, arm-linux-1.63, macos-latest, macos-11, windows, windows-2019]
+        build: [ubuntu, ubuntu-20.04, i686-linux, aarch64-linux, powerpc64le-linux, riscv64-linux, s390x-linux, arm-linux, ubuntu-stable, ubuntu-1.63, i686-linux-stable, aarch64-linux-stable, riscv64-linux-stable, s390x-linux-stable, powerpc64le-linux-stable, arm-linux-stable, ubuntu-1.63, i686-linux-1.63, aarch64-linux-1.63, riscv64-linux-1.63, s390x-linux-1.63, powerpc64le-linux-1.63, arm-linux-1.63, macos-latest, macos-11, windows, windows-2019]
         include:
           - build: ubuntu
             os: ubuntu-latest
-            rust: nightly-2023-07-03
+            rust: nightly
           - build: ubuntu-20.04
             os: ubuntu-20.04
-            rust: nightly-2023-07-03
+            rust: nightly
           - build: i686-linux
             os: ubuntu-latest
-            rust: nightly-2023-07-03
+            rust: nightly
             target: i686-unknown-linux-gnu
             gcc_package: gcc-i686-linux-gnu
             gcc: i686-linux-gnu-gcc
             libc_package: libc-dev-i386-cross
           - build: aarch64-linux
             os: ubuntu-latest
-            rust: nightly-2023-07-03
+            rust: nightly
             target: aarch64-unknown-linux-gnu
             gcc_package: gcc-aarch64-linux-gnu
             gcc: aarch64-linux-gnu-gcc
@@ -251,34 +251,16 @@ jobs:
             qemu_target: aarch64-linux-user
           - build: powerpc64le-linux
             os: ubuntu-latest
-            rust: nightly-2023-07-03
+            rust: nightly
             target: powerpc64le-unknown-linux-gnu
             gcc_package: gcc-powerpc64le-linux-gnu
             gcc: powerpc64le-linux-gnu-gcc
             qemu: qemu-ppc64le
             qemu_args: -L /usr/powerpc64le-linux-gnu
             qemu_target: ppc64le-linux-user
-          - build: mips64el-linux
-            os: ubuntu-latest
-            rust: nightly-2023-07-03
-            target: mips64el-unknown-linux-gnuabi64
-            gcc_package: gcc-mips64el-linux-gnuabi64
-            gcc: mips64el-linux-gnuabi64-gcc
-            qemu: qemu-mips64el
-            qemu_args: -L /usr/mips64el-linux-gnuabi64
-            qemu_target: mips64el-linux-user
-          - build: mipsel-linux
-            os: ubuntu-latest
-            rust: nightly-2023-07-03
-            target: mipsel-unknown-linux-gnu
-            gcc_package: gcc-mipsel-linux-gnu
-            gcc: mipsel-linux-gnu-gcc
-            qemu: qemu-mipsel
-            qemu_args: -L /usr/mipsel-linux-gnu
-            qemu_target: mipsel-linux-user
           - build: riscv64-linux
             os: ubuntu-latest
-            rust: nightly-2023-07-03
+            rust: nightly
             target: riscv64gc-unknown-linux-gnu
             gcc_package: gcc-riscv64-linux-gnu
             gcc: riscv64-linux-gnu-gcc
@@ -287,7 +269,7 @@ jobs:
             qemu_target: riscv64-linux-user
           - build: s390x-linux
             os: ubuntu-latest
-            rust: nightly-2023-07-03
+            rust: nightly
             target: s390x-unknown-linux-gnu
             gcc_package: gcc-s390x-linux-gnu
             gcc: s390x-linux-gnu-gcc
@@ -296,7 +278,7 @@ jobs:
             qemu_target: s390x-linux-user
           - build: arm-linux
             os: ubuntu-latest
-            rust: nightly-2023-07-03
+            rust: nightly
             target: armv5te-unknown-linux-gnueabi
             gcc_package: gcc-arm-linux-gnueabi
             gcc: arm-linux-gnueabi-gcc
@@ -349,24 +331,6 @@ jobs:
             qemu: qemu-ppc64le
             qemu_args: -L /usr/powerpc64le-linux-gnu
             qemu_target: ppc64le-linux-user
-          - build: mips64el-linux-stable
-            os: ubuntu-latest
-            rust: stable
-            target: mips64el-unknown-linux-gnuabi64
-            gcc_package: gcc-mips64el-linux-gnuabi64
-            gcc: mips64el-linux-gnuabi64-gcc
-            qemu: qemu-mips64el
-            qemu_args: -L /usr/mips64el-linux-gnuabi64
-            qemu_target: mips64el-linux-user
-          - build: mipsel-linux-stable
-            os: ubuntu-latest
-            rust: stable
-            target: mipsel-unknown-linux-gnu
-            gcc_package: gcc-mipsel-linux-gnu
-            gcc: mipsel-linux-gnu-gcc
-            qemu: qemu-mipsel
-            qemu_args: -L /usr/mipsel-linux-gnu
-            qemu_target: mipsel-linux-user
           - build: arm-linux-stable
             os: ubuntu-latest
             rust: stable
@@ -422,24 +386,6 @@ jobs:
             qemu: qemu-ppc64le
             qemu_args: -L /usr/powerpc64le-linux-gnu
             qemu_target: ppc64le-linux-user
-          - build: mips64el-linux-1.63
-            os: ubuntu-latest
-            rust: 1.63
-            target: mips64el-unknown-linux-gnuabi64
-            gcc_package: gcc-mips64el-linux-gnuabi64
-            gcc: mips64el-linux-gnuabi64-gcc
-            qemu: qemu-mips64el
-            qemu_args: -L /usr/mips64el-linux-gnuabi64
-            qemu_target: mips64el-linux-user
-          - build: mipsel-linux-1.63
-            os: ubuntu-latest
-            rust: 1.63
-            target: mipsel-unknown-linux-gnu
-            gcc_package: gcc-mipsel-linux-gnu
-            gcc: mipsel-linux-gnu-gcc
-            qemu: qemu-mipsel
-            qemu_args: -L /usr/mipsel-linux-gnu
-            qemu_target: mipsel-linux-user
           - build: arm-linux-1.63
             os: ubuntu-latest
             rust: 1.63
@@ -457,10 +403,10 @@ jobs:
             rust: stable
           - build: windows
             os: windows-latest
-            rust: nightly-2023-07-03
+            rust: nightly
           - build: windows-2019
             os: windows-2019
-            rust: nightly-2023-07-03
+            rust: nightly
     steps:
     - uses: actions/checkout@v3
       with:
@@ -540,7 +486,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        build: [ubuntu, i686-linux, aarch64-linux, powerpc64le-linux, mips64el-linux, mipsel-linux, riscv64-linux, arm-linux]
+        build: [ubuntu, i686-linux, aarch64-linux, powerpc64le-linux, riscv64-linux, arm-linux]
         include:
           - build: ubuntu
             os: ubuntu-latest
@@ -570,24 +516,6 @@ jobs:
             qemu: qemu-ppc64le
             qemu_args: -L /usr/powerpc64le-linux-gnu
             qemu_target: ppc64le-linux-user
-          - build: mips64el-linux
-            os: ubuntu-latest
-            rust: stable
-            target: mips64el-unknown-linux-gnuabi64
-            gcc_package: gcc-mips64el-linux-gnuabi64
-            gcc: mips64el-linux-gnuabi64-gcc
-            qemu: qemu-mips64el
-            qemu_args: -L /usr/mips64el-linux-gnuabi64
-            qemu_target: mips64el-linux-user
-          - build: mipsel-linux
-            os: ubuntu-latest
-            rust: stable
-            target: mipsel-unknown-linux-gnu
-            gcc_package: gcc-mipsel-linux-gnu
-            gcc: mipsel-linux-gnu-gcc
-            qemu: qemu-mipsel
-            qemu_args: -L /usr/mipsel-linux-gnu
-            qemu_target: mipsel-linux-user
           - build: riscv64-linux
             os: ubuntu-latest
             rust: stable
@@ -682,42 +610,22 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        build: [powerpc64le-linux, mipsel-linux, mips64el-linux]
+        build: [powerpc64le-linux]
         include:
           - build: powerpc64le-linux
             os: ubuntu-latest
-            rust: nightly-2023-07-03
+            rust: nightly
             target: powerpc64le-unknown-linux-gnu
             gcc_package: gcc-powerpc64le-linux-gnu
             gcc: powerpc64le-linux-gnu-gcc
             qemu: qemu-ppc64le
             qemu_args: -L /usr/powerpc64le-linux-gnu
             qemu_target: ppc64le-linux-user
-          - build: mips64el-linux
-            os: ubuntu-latest
-            rust: nightly-2023-07-03
-            target: mips64el-unknown-linux-gnuabi64
-            gcc_package: gcc-mips64el-linux-gnuabi64
-            gcc: mips64el-linux-gnuabi64-gcc
-            qemu: qemu-mips64el
-            qemu_args: -L /usr/mips64el-linux-gnuabi64
-            qemu_target: mips64el-linux-user
-          - build: mipsel-linux
-            os: ubuntu-latest
-            rust: nightly-2023-07-03
-            target: mipsel-unknown-linux-gnu
-            gcc_package: gcc-mipsel-linux-gnu
-            gcc: mipsel-linux-gnu-gcc
-            qemu: qemu-mipsel
-            qemu_args: -L /usr/mipsel-linux-gnu
-            qemu_target: mipsel-linux-user
     env:
       # -D warnings is commented out in our install-rust action; re-add it here.
       RUSTFLAGS: --cfg rustix_use_experimental_asm -D warnings
       RUSTDOCFLAGS: --cfg rustix_use_experimental_asm
       CARGO_TARGET_POWERPC64LE_UNKNOWN_LINUX_GNU_RUSTFLAGS: --cfg rustix_use_experimental_asm
-      CARGO_TARGET_MIPSEL_UNKNOWN_LINUX_GNU_RUSTFLAGS: --cfg rustix_use_experimental_asm
-      CARGO_TARGET_MIPS64EL_UNKNOWN_LINUX_GNUABI64_RUSTFLAGS: --cfg rustix_use_experimental_asm
       QEMU_BUILD_VERSION: 8.0.2
     steps:
     - uses: actions/checkout@v3

diff --git a/README.md b/README.md
@@ -107,8 +107,8 @@ struct that's 64-bit even on 32-bit platforms.
 
 ## Similar crates
 
-`rustix` is similar to [`nix`], [`simple_libc`], [`unix`], [`nc`], and
-[`uapi`]. `rustix` is architected for [I/O safety] with most APIs using
+`rustix` is similar to [`nix`], [`simple_libc`], [`unix`], [`nc`], [`uapi`],
+and [`rusl`]. `rustix` is architected for [I/O safety] with most APIs using
 [`OwnedFd`] and [`AsFd`] to manipulate file descriptors rather than `File` or
 even `c_int`, and supporting multiple backends so that it can use direct
 syscalls while still being usable on all platforms `libc` supports. Like `nix`,
@@ -155,6 +155,7 @@ version of this crate.
 [`nc`]: https://crates.io/crates/nc
 [`simple_libc`]: https://crates.io/crates/simple_libc
 [`uapi`]: https://crates.io/crates/uapi
+[`rusl`]: https://lib.rs/crates/rusl
 [`relibc`]: /~https://github.com/redox-os/relibc
 [`syscall`]: https://crates.io/crates/syscall
 [`sc`]: https://crates.io/crates/sc

diff --git a/tests/fs/file.rs b/tests/fs/file.rs
@@ -113,6 +113,11 @@ fn test_file() {
     #[cfg(linux_kernel)]
     let fl = fl - rustix::fs::OFlags::from_bits_retain(linux_raw_sys::general::O_LARGEFILE);
 
+    // On illumos, the system automatically sets `O_LARGEFILE`, so clear it
+    // here so that we can test that no other bits are present.
+    #[cfg(target_os = "illumos")]
+    let fl = fl - rustix::fs::OFlags::from_bits_retain(0x2000);
+
     assert_eq!(fl, rustix::fs::OFlags::empty());
 
     // Test `fcntl_setfd`.