Merge #1506

1506: Test Linux aarch64 on real aarch64 hardware. r=asomers a=asomers Co-authored-by: Alan Somers <asomers@gmail.com>
2025-01-05 23:09:03 +00:00 · 2021-08-28 14:31:02 +00:00 · 2021-08-28 14:31:02 +00:00 · 48fbce9f8f
commit 48fbce9f8f
parent 1ed72d4707 18c095b367
6 changed files with 83 additions and 62 deletions
--- a/.cirrus.yml
+++ b/.cirrus.yml
@ -48,10 +48,8 @@ task:
    RUST_TEST_THREADS: 1            # QEMU works best with 1 thread
    HOME: /tmp/home
    PATH: $HOME/.cargo/bin:$PATH
+    RUSTFLAGS: --cfg qemu
  matrix:
-    - name: Linux aarch64
-      env:
-        TARGET: aarch64-unknown-linux-gnu
    - name: Linux arm gnueabi
      env:
        TARGET: arm-unknown-linux-gnueabi
@ -97,29 +95,36 @@ task:
    - cross test --target $TARGET
  before_cache_script: rm -rf $CARGO_HOME/registry/index

-# Tasks for Linux amd64 builds
+# Tasks for Linux native builds
 task:
  matrix:
    - name: Rust Stable
+      container:
+        image: rust:latest
      env:
        TARGET: x86_64-unknown-linux-gnu
-        TOOLCHAIN: stable
+    - name: Linux aarch64
+      arm_container:
+        image: rust:1.46
+      env:
+        RUSTFLAGS: --cfg graviton
+        TARGET: aarch64-unknown-linux-gnu
    - name: Linux x86_64
+      container:
+        image: rust:1.46
      env:
        TARGET: x86_64-unknown-linux-gnu
-        TOOLCHAIN: 1.46.0
    - name: Linux x86_64 musl
+      container:
+        image: rust:1.46
      env:
        TARGET: x86_64-unknown-linux-musl
-        TOOLCHAIN: 1.46.0
-  container:
-    image: rust:1.46
  setup_script:
-    - rustup toolchain install $TOOLCHAIN
-    - rustup target add --toolchain $TOOLCHAIN $TARGET
+    - rustup target add $TARGET
+    - uname -a
  script:
-    - cargo +$TOOLCHAIN build --target $TARGET --all-targets
-    - cargo +$TOOLCHAIN test --target $TARGET
+    - cargo build --target $TARGET --all-targets
+    - cargo test --target $TARGET
  before_cache_script: rm -rf $CARGO_HOME/registry/index

 # Tasks for cross-compiling, but no testing
--- a/Cross.toml
+++ b/Cross.toml
@ -1,2 +1,5 @@
 [build.env]
-passthrough = ["RUST_TEST_THREADS"]
+passthrough = [
+	"RUSTFLAGS",
+	"RUST_TEST_THREADS"
+]
--- a/test/sys/test_socket.rs
+++ b/test/sys/test_socket.rs
@ -288,9 +288,9 @@ mod recvfrom {
        use nix::sys::socket::sockopt::{UdpGroSegment, UdpGsoSegment};

        #[test]
-        // Disable the test on emulated platforms because it fails in Cirrus-CI.  Lack of QEMU
-        // support is suspected.
-        #[cfg_attr(not(any(target_arch = "x86_64", target_arch="i686")), ignore)]
+        // Disable the test under emulation because it fails in Cirrus-CI.  Lack
+        // of QEMU support is suspected.
+        #[cfg_attr(qemu, ignore)]
        pub fn gso() {
            require_kernel_version!(udp_offload::gso, ">= 4.18");

@ -342,9 +342,9 @@ mod recvfrom {
        }

        #[test]
-        // Disable the test on emulated platforms because it fails in Cirrus-CI.  Lack of QEMU
-        // support is suspected.
-        #[cfg_attr(not(any(target_arch = "x86_64", target_arch="i686")), ignore)]
+        // Disable the test on emulated platforms because it fails in Cirrus-CI.
+        // Lack of QEMU support is suspected.
+        #[cfg_attr(qemu, ignore)]
        pub fn gro() {
            require_kernel_version!(udp_offload::gro, ">= 5.3");

@ -583,7 +583,7 @@ pub fn test_recvmsg_ebadf() {

 // Disable the test on emulated platforms due to a bug in QEMU versions <
 // 2.12.0.  https://bugs.launchpad.net/qemu/+bug/1701808
-#[cfg_attr(not(any(target_arch = "x86_64", target_arch="i686")), ignore)]
+#[cfg_attr(qemu, ignore)]
 #[test]
 pub fn test_scm_rights() {
    use nix::sys::uio::IoVec;
@ -637,8 +637,8 @@ pub fn test_scm_rights() {
 }

 // Disable the test on emulated platforms due to not enabled support of AF_ALG in QEMU from rust cross
-#[cfg_attr(not(any(target_arch = "x86_64", target_arch = "i686")), ignore)]
 #[cfg(any(target_os = "linux", target_os= "android"))]
+#[cfg_attr(qemu, ignore)]
 #[test]
 pub fn test_af_alg_cipher() {
    use libc;
@ -705,9 +705,10 @@ pub fn test_af_alg_cipher() {
    assert_eq!(decrypted, payload);
 }

-// Disable the test on emulated platforms due to not enabled support of AF_ALG in QEMU from rust cross
-#[cfg_attr(not(any(target_arch = "x86_64", target_arch = "i686")), ignore)]
+// Disable the test on emulated platforms due to not enabled support of AF_ALG
+// in QEMU from rust cross
 #[cfg(any(target_os = "linux", target_os= "android"))]
+#[cfg_attr(qemu, ignore)]
 #[test]
 pub fn test_af_alg_aead() {
    use libc::{ALG_OP_DECRYPT, ALG_OP_ENCRYPT};
@ -910,7 +911,7 @@ pub fn test_sendmsg_ipv6packetinfo() {
 /// Tests that passing multiple fds using a single `ControlMessage` works.
 // Disable the test on emulated platforms due to a bug in QEMU versions <
 // 2.12.0.  https://bugs.launchpad.net/qemu/+bug/1701808
-#[cfg_attr(not(any(target_arch = "x86_64", target_arch="i686")), ignore)]
+#[cfg_attr(qemu, ignore)]
 #[test]
 fn test_scm_rights_single_cmsg_multiple_fds() {
    use std::os::unix::net::UnixDatagram;
@ -1057,9 +1058,9 @@ fn test_scm_credentials() {
 /// Ensure that we can send `SCM_CREDENTIALS` and `SCM_RIGHTS` with a single
 /// `sendmsg` call.
 #[cfg(any(target_os = "android", target_os = "linux"))]
-// qemu's handling of multiple cmsgs is bugged, ignore tests on non-x86
+// qemu's handling of multiple cmsgs is bugged, ignore tests under emulation
 // see https://bugs.launchpad.net/qemu/+bug/1781280
-#[cfg_attr(not(any(target_arch = "x86_64", target_arch = "x86")), ignore)]
+#[cfg_attr(qemu, ignore)]
 #[test]
 fn test_scm_credentials_and_rights() {
    use libc;
@ -1071,9 +1072,9 @@ fn test_scm_credentials_and_rights() {
 /// Ensure that passing a an oversized control message buffer to recvmsg
 /// still works.
 #[cfg(any(target_os = "android", target_os = "linux"))]
-// qemu's handling of multiple cmsgs is bugged, ignore tests on non-x86
+// qemu's handling of multiple cmsgs is bugged, ignore tests under emulation
 // see https://bugs.launchpad.net/qemu/+bug/1781280
-#[cfg_attr(not(any(target_arch = "x86_64", target_arch = "x86")), ignore)]
+#[cfg_attr(qemu, ignore)]
 #[test]
 fn test_too_large_cmsgspace() {
    let space = vec![0u8; 1024];
@ -1262,10 +1263,13 @@ fn loopback_address(family: AddressFamily) -> Option<nix::ifaddrs::InterfaceAddr
    target_os = "netbsd",
 ))]
 // qemu doesn't seem to be emulating this correctly in these architectures
-#[cfg_attr(any(
-    target_arch = "mips",
-    target_arch = "mips64",
-    target_arch = "powerpc64",
+#[cfg_attr(all(
+    qemu,
+    any(
+        target_arch = "mips",
+        target_arch = "mips64",
+        target_arch = "powerpc64",
+    )
 ), ignore)]
 #[test]
 pub fn test_recv_ipv4pktinfo() {
@ -1352,10 +1356,13 @@ pub fn test_recv_ipv4pktinfo() {
    target_os = "openbsd",
 ))]
 // qemu doesn't seem to be emulating this correctly in these architectures
-#[cfg_attr(any(
-    target_arch = "mips",
-    target_arch = "mips64",
-    target_arch = "powerpc64",
+#[cfg_attr(all(
+    qemu,
+    any(
+        target_arch = "mips",
+        target_arch = "mips64",
+        target_arch = "powerpc64",
+    )
 ), ignore)]
 #[test]
 pub fn test_recvif() {
@ -1463,10 +1470,13 @@ pub fn test_recvif() {
    target_os = "openbsd",
 ))]
 // qemu doesn't seem to be emulating this correctly in these architectures
-#[cfg_attr(any(
-    target_arch = "mips",
-    target_arch = "mips64",
-    target_arch = "powerpc64",
+#[cfg_attr(all(
+    qemu,
+    any(
+        target_arch = "mips",
+        target_arch = "mips64",
+        target_arch = "powerpc64",
+    )
 ), ignore)]
 #[test]
 pub fn test_recv_ipv6pktinfo() {
@ -1544,6 +1554,7 @@ pub fn test_recv_ipv6pktinfo() {
 }

 #[cfg(any(target_os = "android", target_os = "linux"))]
+#[cfg_attr(graviton, ignore = "Not supported by the CI environment")]
 #[test]
 pub fn test_vsock() {
    use libc;
@ -1588,9 +1599,9 @@ pub fn test_vsock() {
    thr.join().unwrap();
 }

-// Disable the test on emulated platforms because it fails in Cirrus-CI.  Lack of QEMU
-// support is suspected.
-#[cfg_attr(not(any(target_arch = "x86_64")), ignore)]
+// Disable the test on emulated platforms because it fails in Cirrus-CI.  Lack
+// of QEMU support is suspected.
+#[cfg_attr(qemu, ignore)]
 #[cfg(all(target_os = "linux"))]
 #[test]
 fn test_recvmsg_timestampns() {
@ -1639,9 +1650,9 @@ fn test_recvmsg_timestampns() {
    nix::unistd::close(in_socket).unwrap();
 }

-// Disable the test on emulated platforms because it fails in Cirrus-CI.  Lack of QEMU
-// support is suspected.
-#[cfg_attr(not(any(target_arch = "x86_64")), ignore)]
+// Disable the test on emulated platforms because it fails in Cirrus-CI.  Lack
+// of QEMU support is suspected.
+#[cfg_attr(qemu, ignore)]
 #[cfg(all(target_os = "linux"))]
 #[test]
 fn test_recvmmsg_timestampns() {
@ -1696,9 +1707,9 @@ fn test_recvmmsg_timestampns() {
    nix::unistd::close(in_socket).unwrap();
 }

-// Disable the test on emulated platforms because it fails in Cirrus-CI.  Lack of QEMU
-// support is suspected.
-#[cfg_attr(not(any(target_arch = "x86_64")), ignore)]
+// Disable the test on emulated platforms because it fails in Cirrus-CI.  Lack
+// of QEMU support is suspected.
+#[cfg_attr(qemu, ignore)]
 #[cfg(any(target_os = "android", target_os = "fuchsia", target_os = "linux"))]
 #[test]
 fn test_recvmsg_rxq_ovfl() {
--- a/test/sys/test_uio.rs
+++ b/test/sys/test_uio.rs
@ -205,8 +205,8 @@ fn test_preadv() {

 #[test]
 #[cfg(target_os = "linux")]
-// FIXME: qemu-user doesn't implement process_vm_readv/writev on most arches
-#[cfg_attr(not(any(target_arch = "x86", target_arch = "x86_64")), ignore)]
+// qemu-user doesn't implement process_vm_readv/writev on most arches
+#[cfg_attr(qemu, ignore)]
 fn test_process_vm_readv() {
    use nix::unistd::ForkResult::*;
    use nix::sys::signal::*;
--- a/test/test_fcntl.rs
+++ b/test/test_fcntl.rs
@ -236,14 +236,8 @@ mod linux_android {
    /// The from_offset should be updated by the call to reflect
    /// the 3 bytes read (6).
    #[test]
-    // QEMU does not support copy_file_range. Skip platforms that use QEMU in CI
-    #[cfg_attr(all(target_os = "linux", any(
-            target_arch = "aarch64",
-            target_arch = "arm",
-            target_arch = "mips",
-            target_arch = "mips64",
-            target_arch = "powerpc64"
-    )), ignore)]
+    // QEMU does not support copy_file_range. Skip under qemu
+    #[cfg_attr(qemu, ignore)]
    fn test_copy_file_range() {
        const CONTENTS: &[u8] = b"foobarbaz";

--- a/test/test_mq.rs
+++ b/test/test_mq.rs
@ -60,7 +60,11 @@ fn test_mq_getattr() {
 // FIXME: Fix failures for mips in QEMU
 #[test]
 #[cfg(not(any(target_os = "netbsd")))]
-#[cfg_attr(any(target_arch = "mips", target_arch = "mips64"), ignore)]
+#[cfg_attr(all(
+        qemu,
+        any(target_arch = "mips", target_arch = "mips64")
+    ), ignore
+)]
 fn test_mq_setattr() {
    use nix::mqueue::{mq_getattr, mq_setattr};
    const MSG_SIZE: mq_attr_member_t = 32;
@ -97,7 +101,11 @@ fn test_mq_setattr() {
 // FIXME: Fix failures for mips in QEMU
 #[test]
 #[cfg(not(any(target_os = "netbsd")))]
-#[cfg_attr(any(target_arch = "mips", target_arch = "mips64"), ignore)]
+#[cfg_attr(all(
+        qemu,
+        any(target_arch = "mips", target_arch = "mips64")
+    ), ignore
+)]
 fn test_mq_set_nonblocking() {
    use nix::mqueue::{mq_getattr, mq_set_nonblock, mq_remove_nonblock};
    const MSG_SIZE: mq_attr_member_t = 32;