Skip to content

Run multithreaded quiet tests #622

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 14, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 7 additions & 1 deletion ci/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
}

Expand Down
8 changes: 6 additions & 2 deletions ci/runtest-android.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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::<Vec<_>>();
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")
Expand Down