diff --git a/.travis.yml b/.travis.yml index 1551194ee5..d499852691 100644 --- a/.travis.yml +++ b/.travis.yml @@ -112,6 +112,15 @@ matrix: # FIXME: https://github.com/rust-lang/rust/issues/56153 - env: TARGET=x86_64-pc-windows-gnu STDSIMD_DISABLE_ASSERT_INSTR=1 - env: TARGET=i686-pc-windows-gnu + # FIXME https://github.com/rust-lang/libc/issues/1170 + - name: "x86_64-linux-android - no assert_instr" + - name: "arm-linux-androideabi - no assert_instr" + - name: "aarch64-linux-android - no assert_instr" + # clippy changes enough from time to time that it breaks relatively + # regularly + - name: "clippy" + # qemu seems to intermittently segfault... + - name: "powerpc-unknown-linux-gnu - no assert_instr" install: travis_retry rustup target add $TARGET script: diff --git a/ci/run.sh b/ci/run.sh index cb2c867313..c3c1471b94 100755 --- a/ci/run.sh +++ b/ci/run.sh @@ -6,7 +6,6 @@ set -ex # Tests are all super fast anyway, and they fault often enough on travis that # having only one thread increases debuggability to be worth it. -export RUST_TEST_THREADS=1 #export RUST_BACKTRACE=full #export RUST_TEST_NOCAPTURE=1 @@ -46,6 +45,13 @@ cargo_test() { cmd="$cmd -p coresimd -p stdsimd" fi cmd="$cmd -- $2" + if [ "$NORUN" != "1" ] + then + if [ "$TARGET" != "wasm32-unknown-unknown" ] + then + cmd="$cmd --quiet" + fi + fi $cmd } diff --git a/ci/runtest-android.rs b/ci/runtest-android.rs index d8968f99f4..ed1cd80c83 100644 --- a/ci/runtest-android.rs +++ b/ci/runtest-android.rs @@ -3,8 +3,12 @@ use std::process::Command; use std::path::{Path, PathBuf}; fn main() { - assert_eq!(env::args_os().len(), 2); - let test = PathBuf::from(env::args_os().nth(1).unwrap()); + let args = env::args_os() + .skip(1) + .filter(|arg| arg != "--quiet") + .collect::>(); + assert_eq!(args.len(), 1); + let test = PathBuf::from(&args[0]); let dst = Path::new("/data/local/tmp").join(test.file_name().unwrap()); let status = Command::new("adb")