Merge #665

665: Check tier 3s r=asomers

All of the necessary constants should have been merged in upstream libc, so I wanted to file this PR pre-emptively to check that all constants have been accounted for.

Author: bors[bot]

.travis.yml

@@ -48,7 +48,7 @@ matrix:
       rust: 1.13.0
     - env: TARGET=arm-unknown-linux-gnueabi
       rust: 1.13.0
-    - env: TARGET=arm-unknown-linux-musleabi
+    - env: TARGET=arm-unknown-linux-musleabi DISABLE_TESTS=1
       rust: 1.14.0
     - env: TARGET=armv7-unknown-linux-gnueabihf
       rust: 1.13.0
@@ -70,7 +70,7 @@ matrix:
       rust: 1.13.0
     - env: TARGET=powerpc64le-unknown-linux-gnu
       rust: 1.13.0
-    - env: TARGET=s390x-unknown-linux-gnu
+    - env: TARGET=s390x-unknown-linux-gnu DISABLE_TESTS=1
       rust: 1.13.0
     - env: TARGET=x86_64-unknown-linux-gnu
       rust: 1.13.0
@@ -102,16 +102,6 @@ matrix:
     - env: TARGET=x86_64-unknown-linux-gnu
       rust: beta
 
-    # Planning to add these targets, but they can fail for now
-    - env: TARGET=mips64-unknown-linux-gnuabi64
-      rust: 1.13.0
-    - env: TARGET=mips64el-unknown-linux-gnuabi64
-      rust: 1.13.0
-    - env: TARGET=arm-unknown-linux-musleabi
-      rust: 1.14.0
-    - env: TARGET=s390x-unknown-linux-gnu
-      rust: 1.13.0
-
 before_install: set -e
 
 install:

README.md

@@ -57,6 +57,8 @@ Tier 1:
   * i686-unknown-linux-gnu
   * i686-unknown-linux-musl
   * mips-unknown-linux-gnu
+  * mips64-unknown-linux-gnuabi64
+  * mips64el-unknown-linux-gnuabi64
   * mipsel-unknown-linux-gnu
   * powerpc64-unknown-linux-gnu
   * powerpc64le-unknown-linux-gnu
@@ -69,23 +71,19 @@ Tier 2:
   * aarch64-apple-ios
   * aarch64-linux-android
   * arm-linux-androideabi
+  * arm-unknown-linux-musleabi (requires Rust >= 1.14)
   * armv7-apple-ios
   * armv7-linux-androideabi
   * armv7s-apple-ios
   * i386-apple-ios
   * i686-linux-android (requires Rust >= 1.18)
   * i686-unknown-freebsd
   * powerpc-unknown-linux-gnu
+  * s390x-unknown-linux-gnu
   * x86_64-apple-ios
   * x86_64-linux-android (requires Rust >= 1.18)
   * x86_64-unknown-netbsd
 
-Tier 3:
-  * arm-unknown-linux-musleabi (requires Rust >= 1.14)
-  * mips64-unknown-linux-gnuabi64
-  * mips64el-unknown-linux-gnuabi64
-  * s390x-unknown-linux-gnu
-
 ## Usage
 
 To use `nix`, first add this to your `Cargo.toml`:

test/sys/test_aio.rs

@@ -241,7 +241,7 @@ extern fn sigfunc(_: c_int) {
 // Test an aio operation with completion delivered by a signal
 // FIXME: This test is ignored on mips because of failures in qemu in CI
 #[test]
-#[cfg_attr(any(all(target_env = "musl", target_arch = "x86_64"), target_arch = "mips"), ignore)]
+#[cfg_attr(any(all(target_env = "musl", target_arch = "x86_64"), target_arch = "mips", target_arch = "mips64"), ignore)]
 fn test_write_sigev_signal() {
     #[allow(unused_variables)]
     let m = ::SIGNAL_MTX.lock().expect("Mutex got poisoned by another test");
@@ -369,10 +369,10 @@ fn test_lio_listio_nowait() {
 
 // Test lio_listio with LIO_NOWAIT and a SigEvent to indicate when all AioCb's
 // are complete.
-// FIXME: This test is ignored on mips because of failures in qemu in CI.
+// FIXME: This test is ignored on mips/mips64 because of failures in qemu in CI.
 #[test]
 #[cfg(not(any(target_os = "ios", target_os = "macos")))]
-#[cfg_attr(any(target_arch = "mips", target_env = "musl"), ignore)]
+#[cfg_attr(any(target_arch = "mips", target_arch = "mips64", target_env = "musl"), ignore)]
 fn test_lio_listio_signal() {
     #[allow(unused_variables)]
     let m = ::SIGNAL_MTX.lock().expect("Mutex got poisoned by another test");

test/sys/test_ioctl.rs

@@ -86,7 +86,7 @@ ioctl! {
 mod linux {
     #[test]
     fn test_op_none() {
-        if cfg!(any(target_arch = "mips", target_arch="powerpc", target_arch="powerpc64")){
+        if cfg!(any(target_arch = "mips", target_arch = "mips64", target_arch="powerpc", target_arch="powerpc64")){
             assert_eq!(io!(b'q', 10), 0x2000710A);
             assert_eq!(io!(b'a', 255), 0x200061FF);
         } else {
@@ -97,7 +97,7 @@ mod linux {
 
     #[test]
     fn test_op_write() {
-        if cfg!(any(target_arch = "mips", target_arch="powerpc", target_arch="powerpc64")){
+        if cfg!(any(target_arch = "mips", target_arch = "mips64", target_arch="powerpc", target_arch="powerpc64")){
             assert_eq!(iow!(b'z', 10, 1), 0x80017A0A);
             assert_eq!(iow!(b'z', 10, 512), 0x82007A0A);
         } else {
@@ -109,7 +109,7 @@ mod linux {
     #[cfg(target_pointer_width = "64")]
     #[test]
     fn test_op_write_64() {
-        if cfg!(any(target_arch="powerpc64")){
+        if cfg!(any(target_arch = "mips64", target_arch="powerpc64")){
             assert_eq!(iow!(b'z', 10, (1 as u64) << 32), 0x80007A0A);
         } else {
             assert_eq!(iow!(b'z', 10, (1 as u64) << 32), 0x40007A0A);
@@ -119,7 +119,7 @@ mod linux {
 
     #[test]
     fn test_op_read() {
-        if cfg!(any(target_arch = "mips", target_arch="powerpc", target_arch="powerpc64")){
+        if cfg!(any(target_arch = "mips", target_arch = "mips64", target_arch="powerpc", target_arch="powerpc64")){
             assert_eq!(ior!(b'z', 10, 1), 0x40017A0A);
             assert_eq!(ior!(b'z', 10, 512), 0x42007A0A);
         } else {
@@ -131,7 +131,7 @@ mod linux {
     #[cfg(target_pointer_width = "64")]
     #[test]
     fn test_op_read_64() {
-        if cfg!(any(target_arch="powerpc64")){
+        if cfg!(any(target_arch = "mips64", target_arch="powerpc64")){
             assert_eq!(ior!(b'z', 10, (1 as u64) << 32), 0x40007A0A);
         } else {
             assert_eq!(ior!(b'z', 10, (1 as u64) << 32), 0x80007A0A);

test/test_mq.rs

@@ -50,7 +50,7 @@ fn test_mq_getattr() {
 
 // FIXME: Fix failures for mips in QEMU
 #[test]
-#[cfg_attr(target_arch = "mips", ignore)]
+#[cfg_attr(any(target_arch = "mips", target_arch = "mips64"), ignore)]
 fn test_mq_setattr() {
     const MSG_SIZE: c_long =  32;
     let initial_attr =  MqAttr::new(0, 10, MSG_SIZE, 0);
@@ -78,7 +78,7 @@ fn test_mq_setattr() {
 
 // FIXME: Fix failures for mips in QEMU
 #[test]
-#[cfg_attr(target_arch = "mips", ignore)]
+#[cfg_attr(any(target_arch = "mips", target_arch = "mips64"), ignore)]
 fn test_mq_set_nonblocking() {
     const MSG_SIZE: c_long =  32;
     let initial_attr =  MqAttr::new(0, 10, MSG_SIZE, 0);