diff options
-rw-r--r-- | .cirrus.yml | 198 | ||||
-rw-r--r-- | .travis.yml | 136 | ||||
-rw-r--r-- | bors.toml | 51 | ||||
-rw-r--r-- | ci/install.sh | 6 | ||||
-rw-r--r-- | ci/script.sh | 6 | ||||
-rw-r--r-- | src/unistd.rs | 4 | ||||
-rw-r--r-- | test/common/mod.rs | 127 | ||||
-rw-r--r-- | test/sys/test_ptrace.rs | 2 | ||||
-rw-r--r-- | test/sys/test_socket.rs | 14 | ||||
-rw-r--r-- | test/sys/test_sockopt.rs | 2 | ||||
-rw-r--r-- | test/sys/test_uio.rs | 1 | ||||
-rw-r--r-- | test/sys/test_wait.rs | 1 | ||||
-rw-r--r-- | test/test.rs | 111 | ||||
-rw-r--r-- | test/test_fcntl.rs | 4 | ||||
-rw-r--r-- | test/test_kmod/mod.rs | 1 | ||||
-rw-r--r-- | test/test_mount.rs | 3 | ||||
-rw-r--r-- | test/test_unistd.rs | 5 |
17 files changed, 396 insertions, 276 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 3591c0e5..585dd24f 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,16 +1,15 @@ -freebsd_instance: - image: freebsd-11-4-release-amd64 +cargo_cache: + folder: $CARGO_HOME/registry + fingerprint_script: cat Cargo.lock || echo "" -# Test FreeBSD in a full VM on cirrus-ci.com. Test the i686 target too, in the +# Test FreeBSD in a full VM. Test the i686 target too, in the # same VM. The binary will be built in 32-bit mode, but will execute on a # 64-bit kernel and in a 64-bit environment. Our tests don't execute any of # the system's binaries, so the environment shouldn't matter. task: - name: FreeBSD 11.4 - cargo_cache: - folder: $CARGO_HOME/registry - fingerprint_script: cat Cargo.lock || echo "" - # Install Rust + name: FreeBSD amd64 & i686 + freebsd_instance: + image: freebsd-11-4-release-amd64 setup_script: - fetch https://sh.rustup.rs -o rustup.sh - sh rustup.sh -y --profile=minimal --default-toolchain 1.36.0 @@ -22,3 +21,186 @@ task: - . $HOME/.cargo/env - cargo test --target i686-unknown-freebsd before_cache_script: rm -rf $CARGO_HOME/registry/index + +task: + matrix: + - name: OSX x86_64 + env: + TARGET: x86_64-apple-darwin + - name: OSX i686 + env: + TARGET: i686-apple-darwin + DISABLE_TESTS: 1 + - name: iOS + env: + # To save VM startup time, test all iOS targets in a single task. + # The startup and scheduling time was very significant for Travis, but + # not known for Cirrus. + TARGET: "aarch64-apple-ios;armv7-apple-ios;armv7s-apple-ios;i386-apple-ios;x86_64-apple-ios" + DISABLE_TESTS: 1 + osx_instance: + image: catalina-xcode + setup_script: + - curl --proto '=https' --tlsv1.2 -sSf -o rustup.sh https://sh.rustup.rs + - sh rustup.sh -y --profile=minimal --default-toolchain 1.36.0 + - . $HOME/.cargo/env + - bash ci/install.sh + script: + - . $HOME/.cargo/env + - bash ci/script.sh + before_cache_script: rm -rf $CARGO_HOME/registry/index + +# Use cross for QEMU-based testing +# cross needs to execute Docker, so we must use Cirrus's Docker Builder task. +docker_builder: + env: + RUST_TEST_THREADS: 1 # QEMU works best with 1 thread + HOME: /tmp/home + PATH: $HOME/.cargo/bin:$PATH + #cpu: 1 docker_builder doesn't support "cpu"? + matrix: + - name: Linux aarch64 + env: + TARGET: aarch64-unknown-linux-gnu + - name: Linux arm gnueabi + env: + TARGET: arm-unknown-linux-gnueabi + - name: Linux armv7 gnueabihf + env: + TARGET: armv7-unknown-linux-gnueabihf + - name: Linux i686 + env: + TARGET: i686-unknown-linux-gnu + - name: Linux i686 musl + env: + TARGET: i686-unknown-linux-musl + - name: Linux MIPS + env: + TARGET: mips-unknown-linux-gnu + - name: Linux MIPS64 + env: + TARGET: mips64-unknown-linux-gnuabi64 + - name: Linux MIPS64 el + env: + TARGET: mips64el-unknown-linux-gnuabi64 + - name: Linux mipsel + env: + TARGET: mipsel-unknown-linux-gnu + - name: Linux powerpc64le + env: + TARGET: powerpc64le-unknown-linux-gnu + setup_script: + - mkdir /tmp/home + - curl --proto '=https' --tlsv1.2 -sSf -o rustup.sh https://sh.rustup.rs + - sh rustup.sh -y --profile=minimal --default-toolchain 1.36.0 + - . $HOME/.cargo/env + - bash ci/install.sh + script: + - . $HOME/.cargo/env || true + - bash ci/script.sh + before_cache_script: rm -rf $CARGO_HOME/registry/index + +# Tasks for Linux amd64 builds +task: + matrix: + - name: Rust Stable + env: + TARGET: x86_64-unknown-linux-gnu + TOOLCHAIN: stable + - name: Linux x86_64 + env: + TARGET: x86_64-unknown-linux-gnu + TOOLCHAIN: 1.36.0 + - name: Linux x86_64 musl + env: + TARGET: x86_64-unknown-linux-musl + TOOLCHAIN: 1.36.0 + container: + image: rust:1.36 + setup_script: + - rustup toolchain install $TOOLCHAIN + - rustup target add --toolchain $TOOLCHAIN $TARGET + script: + - cargo +$TOOLCHAIN build --target $TARGET --all-targets + - cargo +$TOOLCHAIN build --target $TARGET --all-targets --release + - cargo +$TOOLCHAIN test --target $TARGET + - cargo +$TOOLCHAIN test --target $TARGET --release + before_cache_script: rm -rf $CARGO_HOME/registry/index + +# Tasks for cross-compiling, but no testing +task: + matrix: + - name: Android aarch64 + env: + TARGET: aarch64-linux-android + - name: Android arm + env: + TARGET: arm-linux-androideabi + - name: Android armv7 + env: + TARGET: armv7-linux-androideabi + - name: Android i686 + env: + TARGET: i686-linux-android + - name: Android x86_64 + env: + TARGET: x86_64-linux-android + - name: Linux arm-musleabi + env: + TARGET: arm-unknown-linux-musleabi + - name: Linux powerpc + env: + TARGET: powerpc-unknown-linux-gnu + - name: Linux s390x + env: + TARGET: s390x-unknown-linux-gnu + - name: Linux s390x + env: + TARGET: s390x-unknown-linux-gnu + - name: NetBSD x86_64 + env: + TARGET: x86_64-unknown-netbsd + container: + image: rust:1.36 + setup_script: + - rustup target add $TARGET + script: + - cargo +$TOOLCHAIN check --target $TARGET + - cargo +$TOOLCHAIN check --target $TARGET --release + # TODO: check the tests, too. The old Travis CI setup didn't do that, so + # they don't build on all platforms. + before_cache_script: rm -rf $CARGO_HOME/registry/index + +# Redoxer is too unreliable, so we'll do a cross-build only +# See also: +# https://github.com/nix-rust/nix/issues/1258 +# https://github.com/rust-embedded/cross/issues/427 +task: + name: Redox x86_64 + env: + TARGET: x86_64-unknown-redox + # Redox requires a nightly compiler. + # If stuff breaks, change nightly to the date in the toolchain_* + # directory at https://static.redox-os.org + TOOLCHAIN: nightly-2020-08-04 + container: + image: rustlang/rust:nightly + setup_script: + - rustup toolchain install $TOOLCHAIN --profile minimal --target $TARGET + script: + - cargo +$TOOLCHAIN check --target $TARGET + - cargo +$TOOLCHAIN check --target $TARGET --release + before_cache_script: rm -rf $CARGO_HOME/registry/index + +# Test that we can build with the lowest version of all dependencies. +# "cargo test" doesn't work because some of our dev-dependencies, like +# rand, can't build with thier own minimal dependencies. +task: + name: Minver + container: + image: rustlang/rust:nightly + setup_script: + - cargo update -Zminimal-versions + script: + - cargo check + before_cache_script: rm -rf $CARGO_HOME/registry/index diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index fcef85e9..00000000 --- a/.travis.yml +++ /dev/null @@ -1,136 +0,0 @@ -# Based on the "trust" template v0.1.1 -# https://github.com/japaric/trust/tree/v0.1.1 - -dist: bionic -language: rust -services: docker - -env: - global: - - CRATE_NAME=nix - - RUST_TEST_THREADS=1 - -matrix: - include: - # iOS builds - # These are all done on a single machine because Travis rations their OS X - # builders so heavily that we otherwise can't merge PRs during the work - # week. Additionally they're moved to the front of the line to get them in - # the Travis OS X build queue first. - - env: TARGET="aarch64-apple-ios;armv7-apple-ios;armv7s-apple-ios;i386-apple-ios;x86_64-apple-ios" DISABLE_TESTS=1 - rust: 1.36.0 - os: osx - - # Mac builds - # These are also moved to be first because they wait in a long queue with - # Travis - - env: TARGET=i686-apple-darwin - rust: 1.36.0 - os: osx - - env: TARGET=x86_64-apple-darwin - rust: 1.36.0 - os: osx - - # Android - - env: TARGET=aarch64-linux-android DISABLE_TESTS=1 - rust: 1.36.0 - - env: TARGET=arm-linux-androideabi DISABLE_TESTS=1 - rust: 1.36.0 - - env: TARGET=armv7-linux-androideabi DISABLE_TESTS=1 - rust: 1.36.0 - - env: TARGET=i686-linux-android DISABLE_TESTS=1 - rust: 1.36.0 - - env: TARGET=x86_64-linux-android DISABLE_TESTS=1 - rust: 1.36.0 - - # Linux - - env: TARGET=aarch64-unknown-linux-gnu - rust: 1.36.0 - - env: TARGET=arm-unknown-linux-gnueabi - rust: 1.36.0 - - env: TARGET=arm-unknown-linux-musleabi DISABLE_TESTS=1 - rust: 1.36.0 - - env: TARGET=armv7-unknown-linux-gnueabihf - rust: 1.36.0 - - env: TARGET=i686-unknown-linux-gnu - rust: 1.36.0 - - env: TARGET=i686-unknown-linux-musl - rust: 1.36.0 - - env: TARGET=mips-unknown-linux-gnu - rust: 1.36.0 - - env: TARGET=mips64-unknown-linux-gnuabi64 - rust: 1.36.0 - - env: TARGET=mips64el-unknown-linux-gnuabi64 - rust: 1.36.0 - - env: TARGET=mipsel-unknown-linux-gnu - rust: 1.36.0 - - env: TARGET=powerpc-unknown-linux-gnu DISABLE_TESTS=1 - rust: 1.36.0 - - env: TARGET=powerpc64le-unknown-linux-gnu - rust: 1.36.0 - - env: TARGET=s390x-unknown-linux-gnu DISABLE_TESTS=1 - rust: 1.36.0 - - env: TARGET=x86_64-unknown-linux-gnu - rust: 1.36.0 - - env: TARGET=x86_64-unknown-linux-musl - rust: 1.36.0 - - # *BSD - # FreeBSD i686 and x86_64 use Cirrus instead of Travis - # - env: TARGET=i686-unknown-freebsd DISABLE_TESTS=1 - # - env: TARGET=x86_64-unknown-freebsd DISABLE_TESTS=1 - - env: TARGET=x86_64-unknown-netbsd DISABLE_TESTS=1 - rust: 1.36.0 - - # Make sure stable is always working too - - env: TARGET=x86_64-unknown-linux-gnu - rust: stable - - # Test that we can build with the lowest version of all dependencies. - # "cargo test" doesn't work because some of our dev-dependencies, like - # rand, can't build with thier own minimal dependencies. - - rust: nightly - script: - - cargo update -Zminimal-versions - - cargo check - - # Redoxer is too unreliable, so we'll do a cross-build only - # See also: - # https://github.com/nix-rust/nix/issues/1258 - # https://github.com/rust-embedded/cross/issues/427 - - language: generic - name: redox - script: - - curl --proto '=https' --tlsv1.2 -sSf --output rustup.sh https://sh.rustup.rs - - sh rustup.sh -y --profile=minimal --default-toolchain 1.36.0 --target x86_64-unknown-redox - - . $HOME/.cargo/env - - cargo build --all-targets - -before_install: set -e - -install: - - bash ci/install.sh - - source ~/.cargo/env || true - -script: - - bash ci/script.sh - -after_script: set +e - -cache: cargo -before_cache: - # Travis can't cache files that are not readable by "others" - - chmod -R a+r $HOME/.cargo - -branches: - only: - # release tags - - /^v\d+\.\d+\.\d+.*$/ - - master - # bors-ng branches; see https://bors-ng.github.io/getting-started/ - - trying - - staging - -notifications: - email: - on_success: never @@ -1,16 +1,45 @@ # Gate on Travis CI and Buildbot -status = ["continuous-integration/travis-ci/push", - "FreeBSD 11.4"] +status = [ + "FreeBSD amd64 & i686", + "OSX x86_64", + "OSX i686", + "iOS", + "Linux aarch64", + "Linux arm gnueabi", + "Linux armv7 gnueabihf", + "Linux i686", + "Linux i686 musl", + "Linux MIPS", + "Linux MIPS64", + "Linux MIPS64 el", + "Linux mipsel", + "Linux powerpc64le", + "Rust Stable", + "Linux x86_64", + "Linux x86_64 musl", + "Android aarch64", + "Android arm", + "Android armv7", + "Android i686", + "Android x86_64", + "Linux arm-musleabi", + "Linux powerpc", + "Linux s390x", + "Linux s390x", + "NetBSD x86_64", + "Redox x86_64", + "Minver", +] -# Set bors's timeout to 4 hours +# Set bors's timeout to 1 hour # -# bors's timeout should always be twice a long as the test suite takes. -# This is to allow Travis to fast-fail a test; if one of the builders +# bors's timeout should always be at least twice as long as the test suite +# takes. This is to allow Travis to fast-fail a test; if one of the builders # immediately reports a failure, then bors will move on to the next batch, -# leaving the slower builders to work through the already-doomed run and -# the next one. +# leaving the slower builders to work through the already-doomed run and the +# next one. # -# At the time this was written, nix's test suite took about an hour to run. -# The timeout was raised to four hours, instead of two, to give nix room -# to grow and time for delays on Travis's end. -timeout_sec = 14400 +# At the time this was written, nix's test suite took about twenty minutes to +# run. The timeout was raised to one hour to give nix room to grow and time +# for delays on Cirrus's end. +timeout_sec = 3600 diff --git a/ci/install.sh b/ci/install.sh index 5997c7cb..bcb7c110 100644 --- a/ci/install.sh +++ b/ci/install.sh @@ -3,12 +3,10 @@ set -ex main() { local target= - if [ $TRAVIS_OS_NAME = linux ]; then + if [ $CIRRUS_OS = linux ]; then target=x86_64-unknown-linux-musl - sort=sort else target=x86_64-apple-darwin - sort=gsort # for `sort --sort-version`, from brew's coreutils. fi # Builds for iOS are done on OSX, but require the specific target to be @@ -38,7 +36,7 @@ main() { local tag=$(git ls-remote --tags --refs --exit-code https://github.com/japaric/cross \ | cut -d/ -f3 \ | grep -E '^v[0.1.0-9.]+$' \ - | $sort --version-sort \ + | sort --version-sort \ | tail -n1) curl -LSfs https://japaric.github.io/trust/install.sh | \ sh -s -- \ diff --git a/ci/script.sh b/ci/script.sh index e1d1ab7e..f998039a 100644 --- a/ci/script.sh +++ b/ci/script.sh @@ -5,8 +5,8 @@ set -ex main() { # Add a cfg spec to allow disabling specific tests under CI. - if [ "$TRAVIS" = true ]; then - export RUSTFLAGS=--cfg=travis + if [ "$CIRRUS_CI" = true ]; then + export RUSTFLAGS=--cfg=cirrus fi IFS=';' read -ra TARGET_ARRAY <<< "$TARGET" @@ -26,6 +26,6 @@ main() { } # we don't run the "test phase" when doing deploys -if [ -z $TRAVIS_TAG ]; then +if [ -z $CIRRUS_TAG ]; then main fi diff --git a/src/unistd.rs b/src/unistd.rs index 04031e37..a945ac26 100644 --- a/src/unistd.rs +++ b/src/unistd.rs @@ -12,9 +12,9 @@ use libc::{self, c_char, c_void, c_int, c_long, c_uint, size_t, pid_t, off_t, uid_t, gid_t, mode_t, PATH_MAX}; use std::{fmt, mem, ptr}; use std::convert::Infallible; -use std::ffi::{CStr, CString, OsString}; +use std::ffi::{CStr, OsString}; #[cfg(not(target_os = "redox"))] -use std::ffi::{OsStr}; +use std::ffi::{CString, OsStr}; use std::os::unix::ffi::OsStringExt; #[cfg(not(target_os = "redox"))] use std::os::unix::ffi::OsStrExt; diff --git a/test/common/mod.rs b/test/common/mod.rs new file mode 100644 index 00000000..ace03fc6 --- /dev/null +++ b/test/common/mod.rs @@ -0,0 +1,127 @@ +use cfg_if::cfg_if; + +#[macro_export] macro_rules! skip { + ($($reason: expr),+) => { + use ::std::io::{self, Write}; + + let stderr = io::stderr(); + let mut handle = stderr.lock(); + writeln!(handle, $($reason),+).unwrap(); + return; + } +} + +cfg_if! { + if #[cfg(any(target_os = "android", target_os = "linux"))] { + #[macro_export] macro_rules! require_capability { + ($capname:ident) => { + use ::caps::{Capability, CapSet, has_cap}; + + if !has_cap(None, CapSet::Effective, Capability::$capname) + .unwrap() + { + skip!("Insufficient capabilities. Skipping test."); + } + } + } + } else if #[cfg(not(target_os = "redox"))] { + #[macro_export] macro_rules! require_capability { + ($capname:ident) => {} + } + } +} + +#[cfg(any(target_os = "linux", target_os= "android"))] +#[macro_export] macro_rules! skip_if_cirrus { + ($reason:expr) => { + if std::env::var_os("CIRRUS_CI").is_some() { + skip!("{}", $reason); + } + } +} + +#[cfg(target_os = "freebsd")] +#[macro_export] macro_rules! skip_if_jailed { + ($name:expr) => { + use ::sysctl::CtlValue; + + if let CtlValue::Int(1) = ::sysctl::value("security.jail.jailed") + .unwrap() + { + skip!("{} cannot run in a jail. Skipping test.", $name); + } + } +} + +#[cfg(not(target_os = "redox"))] +#[macro_export] macro_rules! skip_if_not_root { + ($name:expr) => { + use nix::unistd::Uid; + + if !Uid::current().is_root() { + skip!("{} requires root privileges. Skipping test.", $name); + } + }; +} + +cfg_if! { + if #[cfg(any(target_os = "android", target_os = "linux"))] { + #[macro_export] macro_rules! skip_if_seccomp { + ($name:expr) => { + if let Ok(s) = std::fs::read_to_string("/proc/self/status") { + for l in s.lines() { + let mut fields = l.split_whitespace(); + if fields.next() == Some("Seccomp:") && + fields.next() != Some("0") + { + skip!("{} cannot be run in Seccomp mode. Skipping test.", + stringify!($name)); + } + } + } + } + } + } else if #[cfg(not(target_os = "redox"))] { + #[macro_export] macro_rules! skip_if_seccomp { + ($name:expr) => {} + } + } +} + +cfg_if! { + if #[cfg(target_os = "linux")] { + #[macro_export] macro_rules! require_kernel_version { + ($name:expr, $version_requirement:expr) => { + use semver::{Version, VersionReq}; + + let version_requirement = VersionReq::parse($version_requirement) + .expect("Bad match_version provided"); + + let uname = nix::sys::utsname::uname(); + println!("{}", uname.sysname()); + println!("{}", uname.nodename()); + println!("{}", uname.release()); + println!("{}", uname.version()); + println!("{}", uname.machine()); + + // Fix stuff that the semver parser can't handle + let fixed_release = &uname.release().to_string() + // Fedora 33 reports version as 4.18.el8_2.x86_64 or + // 5.18.200-fc33.x86_64. Remove the underscore. + .replace("_", "-") + // Cirrus-CI reports version as 4.19.112+ . Remove the + + .replace("+", ""); + let mut version = Version::parse(fixed_release).unwrap(); + + //Keep only numeric parts + version.pre.clear(); + version.build.clear(); + + if !version_requirement.matches(&version) { + skip!("Skip {} because kernel version `{}` doesn't match the requirement `{}`", + stringify!($name), version, version_requirement); + } + } + } + } +} diff --git a/test/sys/test_ptrace.rs b/test/sys/test_ptrace.rs index 3b60dd70..38cf408b 100644 --- a/test/sys/test_ptrace.rs +++ b/test/sys/test_ptrace.rs @@ -8,6 +8,8 @@ use nix::sys::ptrace::Options; #[cfg(any(target_os = "android", target_os = "linux"))] use std::mem; +use crate::*; + #[test] fn test_ptrace() { // Just make sure ptrace can be called at all, for now. diff --git a/test/sys/test_socket.rs b/test/sys/test_socket.rs index c5abb7ba..313b2d86 100644 --- a/test/sys/test_socket.rs +++ b/test/sys/test_socket.rs @@ -9,6 +9,8 @@ use std::slice; use std::str::FromStr; use libc::c_char; use tempfile; +#[cfg(any(target_os = "linux", target_os= "android"))] +use crate::*; #[test] pub fn test_inetv4_addr_to_sock_addr() { @@ -237,6 +239,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)] pub fn gso() { require_kernel_version!(udp_offload::gso, ">= 4.18"); @@ -288,6 +293,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)] pub fn gro() { require_kernel_version!(udp_offload::gro, ">= 5.3"); @@ -592,12 +600,13 @@ pub fn test_af_alg_cipher() { ControlMessage, MsgFlags}; use nix::sys::socket::sockopt::AlgSetKey; + skip_if_cirrus!("Fails for an unknown reason Cirrus CI. Bug #1352"); // Travis's seccomp profile blocks AF_ALG // https://docs.docker.com/engine/security/seccomp/ skip_if_seccomp!(test_af_alg_cipher); let alg_type = "skcipher"; - let alg_name = "ctr(aes)"; + let alg_name = "ctr-aes-aesni"; // 256-bits secret key let key = vec![0u8; 32]; // 16-bytes IV @@ -660,6 +669,7 @@ pub fn test_af_alg_aead() { ControlMessage, MsgFlags}; use nix::sys::socket::sockopt::{AlgSetKey, AlgSetAeadAuthSize}; + skip_if_cirrus!("Fails for an unknown reason Cirrus CI. Bug #1352"); // Travis's seccomp profile blocks AF_ALG // https://docs.docker.com/engine/security/seccomp/ skip_if_seccomp!(test_af_alg_aead); @@ -1018,7 +1028,7 @@ fn test_too_large_cmsgspace() { fn test_impl_scm_credentials_and_rights(mut space: Vec<u8>) { use libc::ucred; use nix::sys::uio::IoVec; - use nix::unistd::{pipe, read, write, close, getpid, getuid, getgid}; + use nix::unistd::{pipe, write, close, getpid, getuid, getgid}; use nix::sys::socket::{socketpair, sendmsg, recvmsg, setsockopt, SockType, SockFlag, ControlMessage, ControlMessageOwned, MsgFlags}; diff --git a/test/sys/test_sockopt.rs b/test/sys/test_sockopt.rs index 8e2adced..56065931 100644 --- a/test/sys/test_sockopt.rs +++ b/test/sys/test_sockopt.rs @@ -1,5 +1,7 @@ use rand::{thread_rng, Rng}; use nix::sys::socket::{socket, sockopt, getsockopt, setsockopt, AddressFamily, SockType, SockFlag, SockProtocol}; +#[cfg(any(target_os = "android", target_os = "linux"))] +use crate::*; #[cfg(target_os = "linux")] #[test] diff --git a/test/sys/test_uio.rs b/test/sys/test_uio.rs index 4fa838c9..8d22bf17 100644 --- a/test/sys/test_uio.rs +++ b/test/sys/test_uio.rs @@ -203,6 +203,7 @@ fn test_process_vm_readv() { use nix::unistd::ForkResult::*; use nix::sys::signal::*; use nix::sys::wait::*; + use crate::*; require_capability!(CAP_SYS_PTRACE); let _ = crate::FORK_MTX.lock().expect("Mutex got poisoned by another test"); diff --git a/test/sys/test_wait.rs b/test/sys/test_wait.rs index d1056250..5bb298eb 100644 --- a/test/sys/test_wait.rs +++ b/test/sys/test_wait.rs @@ -67,6 +67,7 @@ mod ptrace { use nix::unistd::*; use nix::unistd::ForkResult::*; use libc::_exit; + use crate::*; fn ptrace_child() -> ! { ptrace::traceme().unwrap(); diff --git a/test/test.rs b/test/test.rs index 37c81f94..b57c1a66 100644 --- a/test/test.rs +++ b/test/test.rs @@ -5,115 +5,7 @@ extern crate nix; #[macro_use] extern crate lazy_static; -macro_rules! skip { - ($($reason: expr),+) => { - use ::std::io::{self, Write}; - - let stderr = io::stderr(); - let mut handle = stderr.lock(); - writeln!(handle, $($reason),+).unwrap(); - return; - } -} - -cfg_if! { - if #[cfg(any(target_os = "android", target_os = "linux"))] { - macro_rules! require_capability { - ($capname:ident) => { - use ::caps::{Capability, CapSet, has_cap}; - - if !has_cap(None, CapSet::Effective, Capability::$capname) - .unwrap() - { - skip!("Insufficient capabilities. Skipping test."); - } - } - } - } else if #[cfg(not(target_os = "redox"))] { - macro_rules! require_capability { - ($capname:ident) => {} - } - } -} - -#[cfg(target_os = "freebsd")] -macro_rules! skip_if_jailed { - ($name:expr) => { - use ::sysctl::CtlValue; - - if let CtlValue::Int(1) = ::sysctl::value("security.jail.jailed") - .unwrap() - { - skip!("{} cannot run in a jail. Skipping test.", $name); - } - } -} - -#[cfg(not(target_os = "redox"))] -macro_rules! skip_if_not_root { - ($name:expr) => { - use nix::unistd::Uid; - - if !Uid::current().is_root() { - skip!("{} requires root privileges. Skipping test.", $name); - } - }; -} - -cfg_if! { - if #[cfg(any(target_os = "android", target_os = "linux"))] { - macro_rules! skip_if_seccomp { - ($name:expr) => { - if let Ok(s) = std::fs::read_to_string("/proc/self/status") { - for l in s.lines() { - let mut fields = l.split_whitespace(); - if fields.next() == Some("Seccomp:") && - fields.next() != Some("0") - { - skip!("{} cannot be run in Seccomp mode. Skipping test.", - stringify!($name)); - } - } - } - } - } - } else if #[cfg(not(target_os = "redox"))] { - macro_rules! skip_if_seccomp { - ($name:expr) => {} - } - } -} - -cfg_if! { - if #[cfg(target_os = "linux")] { - macro_rules! require_kernel_version { - ($name:expr, $version_requirement:expr) => { - use semver::{Version, VersionReq}; - - let version_requirement = VersionReq::parse($version_requirement) - .expect("Bad match_version provided"); - - let uname = nix::sys::utsname::uname(); - - // Linux may report version as 4.18.el8_2.x86_64 or 5.18.200-fc33.x86_64 - // semver sematics does not support underscore. Replace this with hypen. - let mut version = Version::parse( - &uname.release().to_string().replace("_", "-") - ).unwrap(); - - //Keep only numeric parts - version.pre.clear(); - version.build.clear(); - - if !version_requirement.matches(&version) { - skip!("Skip {} because kernel version `{}` doesn't match the requirement `{}`", - stringify!($name), version, version_requirement); - } - } - } - } -} - +mod common; mod sys; #[cfg(not(target_os = "redox"))] mod test_dir; @@ -151,6 +43,7 @@ use std::path::PathBuf; use std::sync::{Mutex, RwLock, RwLockWriteGuard}; use nix::unistd::{chdir, getcwd, read}; + /// Helper function analogous to `std::io::Read::read_exact`, but for `RawFD`s fn read_exact(f: RawFd, buf: &mut [u8]) { let mut len = 0; diff --git a/test/test_fcntl.rs b/test/test_fcntl.rs index 29719072..1e8b2678 100644 --- a/test/test_fcntl.rs +++ b/test/test_fcntl.rs @@ -19,6 +19,8 @@ use std::io::prelude::*; #[cfg(not(target_os = "redox"))] use std::os::unix::fs; +use crate::*; + #[test] #[cfg(not(target_os = "redox"))] fn test_openat() { @@ -93,6 +95,8 @@ mod linux_android { use tempfile::{tempfile, NamedTempFile}; + use crate::*; + /// This test creates a temporary file containing the contents /// 'foobarbaz' and uses the `copy_file_range` call to transfer /// 3 bytes at offset 3 (`bar`) to another empty file at offset 0. The diff --git a/test/test_kmod/mod.rs b/test/test_kmod/mod.rs index e7472ab8..fb7260ba 100644 --- a/test/test_kmod/mod.rs +++ b/test/test_kmod/mod.rs @@ -2,6 +2,7 @@ use std::fs::copy; use std::path::PathBuf; use std::process::Command; use tempfile::{tempdir, TempDir}; +use crate::*; fn compile_kernel_module() -> (PathBuf, String, TempDir) { let _m = crate::FORK_MTX diff --git a/test/test_mount.rs b/test/test_mount.rs index 605276b5..c1b6c8a3 100644 --- a/test/test_mount.rs +++ b/test/test_mount.rs @@ -1,3 +1,5 @@ +mod common; + // Impelmentation note: to allow unprivileged users to run it, this test makes // use of user and mount namespaces. On systems that allow unprivileged user // namespaces (Linux >= 3.8 compiled with CONFIG_USER_NS), the test should run @@ -222,6 +224,7 @@ fn main() { 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}; + skip_if_cirrus!("Fails for an unknown reason Cirrus CI. Bug #1351"); setup_namespaces(); run_tests!(test_mount_tmpfs_without_flags_allows_rwx, diff --git a/test/test_unistd.rs b/test/test_unistd.rs index 34f7f561..de696718 100644 --- a/test/test_unistd.rs +++ b/test/test_unistd.rs @@ -26,6 +26,8 @@ use std::path::Path; use tempfile::{tempdir, tempfile}; use libc::{_exit, off_t}; +use crate::*; + #[test] #[cfg(not(any(target_os = "netbsd")))] fn test_fork_and_waitpid() { @@ -990,8 +992,9 @@ fn test_setfsuid() { let nobody = User::from_name("nobody").unwrap().unwrap(); // create a temporary file with permissions '-rw-r-----' - let file = tempfile::NamedTempFile::new().unwrap(); + let file = tempfile::NamedTempFile::new_in("/var/tmp").unwrap(); let temp_path = file.into_temp_path(); + dbg!(&temp_path); let temp_path_2 = (&temp_path).to_path_buf(); let mut permissions = fs::metadata(&temp_path).unwrap().permissions(); permissions.set_mode(640); |