Skip to content

Commit 0ada7cc

Browse files
committed
Run multithreaded quiet tests
We historically have run single-threaded verbose tests because we were faulting all over the place due to bugs in rustc itself, primarily around calling conventions and passing values around. Those bugs have all since been fixed so we should be clear to run multithreaded tests quietly on CI nowadays! Closes #621
1 parent 359b736 commit 0ada7cc

File tree

3 files changed

+17
-3
lines changed

3 files changed

+17
-3
lines changed

.travis.yml

+4
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,10 @@ matrix:
112112
# FIXME: https://github.com/rust-lang/rust/issues/56153
113113
- env: TARGET=x86_64-pc-windows-gnu STDSIMD_DISABLE_ASSERT_INSTR=1
114114
- env: TARGET=i686-pc-windows-gnu
115+
# FIXME https://github.com/rust-lang/libc/issues/1170
116+
- name: "x86_64-linux-android - no assert_instr"
117+
- name: "arm-linux-androideabi - no assert_instr"
118+
- name: "aarch64-linux-android - no assert_instr"
115119

116120
install: travis_retry rustup target add $TARGET
117121
script:

ci/run.sh

+7-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ set -ex
66

77
# Tests are all super fast anyway, and they fault often enough on travis that
88
# having only one thread increases debuggability to be worth it.
9-
export RUST_TEST_THREADS=1
109
#export RUST_BACKTRACE=full
1110
#export RUST_TEST_NOCAPTURE=1
1211

@@ -46,6 +45,13 @@ cargo_test() {
4645
cmd="$cmd -p coresimd -p stdsimd"
4746
fi
4847
cmd="$cmd -- $2"
48+
if [ "$NORUN" != "1" ]
49+
then
50+
if [ "$TARGET" != "wasm32-unknown-unknown" ]
51+
then
52+
cmd="$cmd --quiet"
53+
fi
54+
fi
4955
$cmd
5056
}
5157

ci/runtest-android.rs

+6-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,12 @@ use std::process::Command;
33
use std::path::{Path, PathBuf};
44

55
fn main() {
6-
assert_eq!(env::args_os().len(), 2);
7-
let test = PathBuf::from(env::args_os().nth(1).unwrap());
6+
let args = env::args_os()
7+
.skip(1)
8+
.filter(|arg| arg != "--quiet")
9+
.collect::<Vec<_>>();
10+
assert_eq!(args.len(), 1);
11+
let test = PathBuf::from(&args[0]);
812
let dst = Path::new("/data/local/tmp").join(test.file_name().unwrap());
913

1014
let status = Command::new("adb")

0 commit comments

Comments
 (0)