Always run the mount tests, but "skip" (actually pass) when the buggy

errno is returned.

Author: asomers

.travis.yml

@@ -16,21 +16,74 @@ matrix:
   # don't need
   include:
     # Linux
+    - env: TARGET=aarch64-unknown-linux-gnu
+      rust: 1.13.0
+    - env: TARGET=arm-unknown-linux-gnueabi
+      rust: 1.13.0
+    # - env: TARGET=arm-unknown-linux-musleabi
+    - env: TARGET=armv7-unknown-linux-gnueabihf
+      rust: 1.13.0
+    - env: TARGET=i686-unknown-linux-gnu
+      rust: 1.13.0
+    - env: TARGET=i686-unknown-linux-musl
+      rust: 1.13.0
+    - env: TARGET=mips-unknown-linux-gnu
+      rust: 1.13.0
+    # - env: TARGET=mips64-unknown-linux-gnuabi64
+    # - env: TARGET=mips64el-unknown-linux-gnuabi64
+    - env: TARGET=mipsel-unknown-linux-gnu
+      rust: 1.13.0
+    - env: TARGET=powerpc-unknown-linux-gnu
+      rust: 1.13.0
+    - env: TARGET=powerpc64-unknown-linux-gnu
+      rust: 1.13.0
+    - env: TARGET=powerpc64le-unknown-linux-gnu
+      rust: 1.13.0
+    # - env: TARGET=s390x-unknown-linux-gnu
     - env: TARGET=x86_64-unknown-linux-gnu
       rust: 1.13.0
+    - env: TARGET=x86_64-unknown-linux-musl
+      rust: 1.13.0
 
     # OSX
+    - env: TARGET=i686-apple-darwin
+      rust: 1.13.0
+      os: osx
     - env: TARGET=x86_64-apple-darwin
       rust: 1.13.0
       os: osx
 
+    # *BSD
+    - env: TARGET=i686-unknown-freebsd DISABLE_TESTS=1
+      rust: 1.13.0
+    # - env: TARGET=x86_64-unknown-freebsd DISABLE_TESTS=1 # Uses BuildBot instead
+    - env: TARGET=x86_64-unknown-netbsd DISABLE_TESTS=1
+      rust: 1.13.0
+
     # Testing beta on main targets
     - env: TARGET=x86_64-unknown-linux-gnu
       rust: beta
+    - env: TARGET=x86_64-apple-darwin
+      os: osx
+      rust: beta
 
     # Testing nightly on main targets (allowed to fail)
     - env: TARGET=x86_64-unknown-linux-gnu
       rust: nightly
+    - env: TARGET=x86_64-apple-darwin
+      os: osx
+      rust: nightly
+
+  # Testing nightlies on main targets. These might fail because of issues
+  # with the compiler, so we allow failures here.
+  allow_failures:
+    # Failures for nightlies may be because of compiler bugs, so don't fail the
+    # build if these fail.
+    - env: TARGET=x86_64-unknown-linux-gnu
+      rust: nightly
+    - env: TARGET=x86_64-apple-darwin
+      os: osx
+      rust: nightly
 
 before_install: set -e
 

ci/install.sh

@@ -17,7 +17,7 @@ main() {
                        | $sort --version-sort \
                        | tail -n1)
     curl -LSfs https://japaric.github.io/trust/install.sh | \
-        sh -xs -- \
+        sh -s -- \
            --force \
            --git japaric/cross \
            --tag $tag \

ci/script.sh

@@ -9,7 +9,6 @@ main() {
     fi
 
     # Build debug and release targets
-    rustup default stable-x86_64-unknown-linux-gnu	# XXX does cross require a default toolchain?
     cross build --target $TARGET
     cross build --target $TARGET --release
 

test/test_mount.rs

@@ -17,11 +17,11 @@ mod test_mount {
 
     use libc::{EACCES, EROFS};
 
+    use nix::errno::Errno;
     use nix::mount::{mount, umount, MsFlags, MS_BIND, MS_RDONLY, MS_NOEXEC};
     use nix::sched::{unshare, CLONE_NEWNS, CLONE_NEWUSER};
     use nix::sys::stat::{self, S_IRWXU, S_IRWXG, S_IRWXO, S_IXUSR, S_IXGRP, S_IXOTH};
     use nix::unistd::getuid;
-    use nix::sys::utsname;
 
     use tempdir::TempDir;
 
@@ -31,20 +31,6 @@ exit 23";
     const EXPECTED_STATUS: i32 = 23;
 
     const NONE: Option<&'static [u8]> = None;
-
-    // Skip tests on kernel 4.4.0, which has a bug regarding tmpfs in namespaces
-    // https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1659087
-    pub fn check_kernel() {
-	let u = utsname::uname();
-	if u.release().starts_with("4.4.0") {
-	    let stderr = io::stderr();
-	    let mut handle = stderr.lock();
-            writeln!(handle, "Linux kernel 4.4.0 has known bugs with tmpfs in namespaces.  Skipping test.")
-	        .unwrap();
-            process::exit(0);
-	}
-    }
-
     pub fn test_mount_tmpfs_without_flags_allows_rwx() {
         let tempdir = TempDir::new("nix-test_mount")
                           .unwrap_or_else(|e| panic!("tempdir failed: {}", e));
@@ -64,6 +50,23 @@ exit 23";
             .write(true)
             .mode((S_IRWXU | S_IRWXG | S_IRWXO).bits())
             .open(&test_path)
+            .or_else(|e|
+                if Errno::from_i32(e.raw_os_error().unwrap()) == Errno::EOVERFLOW {
+                    // Skip tests on certain Linux kernels which have a bug
+                    // regarding tmpfs in namespaces.
+                    // Ubuntu 14.04 and 16.04 are known to be affected; 16.10 is
+                    // not.  There is no legitimate reason for open(2) to return
+                    // EOVERFLOW here.
+                    // https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1659087
+                    let stderr = io::stderr();
+                    let mut handle = stderr.lock();
+                    writeln!(handle, "Buggy Linux kernel detected.  Skipping test.")
+                    .unwrap();
+                    process::exit(0);
+               } else {
+                   panic!("open failed: {}", e);
+               }
+            )
             .and_then(|mut f| f.write(SCRIPT_CONTENTS))
             .unwrap_or_else(|e| panic!("write failed: {}", e));
 
@@ -200,7 +203,6 @@ exit 23";
             .write(true)
             .open("/proc/self/uid_map")
             .and_then(|mut f| f.write(format!("1000 {} 1\n", uid).as_bytes()))
-            //.and_then(|mut f| f.write(format!("1000 {} 1\n", uid).as_bytes()))
             .unwrap_or_else(|e| panic!("could not write uid map: {}", e));
     }
 }
@@ -225,12 +227,9 @@ macro_rules! run_tests {
 
 #[cfg(target_os = "linux")]
 fn main() {
-    use test_mount::{setup_namespaces, check_kernel,
-                     test_mount_tmpfs_without_flags_allows_rwx,
-                     test_mount_rdonly_disallows_write,
-                     test_mount_noexec_disallows_exec,
+    use test_mount::{setup_namespaces, test_mount_tmpfs_without_flags_allows_rwx,
+                     test_mount_rdonly_disallows_write, test_mount_noexec_disallows_exec,
                      test_mount_bind};
-    check_kernel();
     setup_namespaces();
 
     run_tests!(test_mount_tmpfs_without_flags_allows_rwx,