Skip to content

Commit

Permalink
show what happens durung many-seeds
Browse files Browse the repository at this point in the history
  • Loading branch information
RalfJung committed May 4, 2024
1 parent 6b93ac6 commit e369256
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions ci/ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ function run_tests {
if [ -n "${GC_STRESS-}" ]; then
time MIRIFLAGS="${MIRIFLAGS-} -Zmiri-provenance-gc=1" ./miri test
else
time ./miri test
time ./miri test dep
fi

## advanced tests
Expand All @@ -64,7 +64,7 @@ function run_tests {
if [ -n "${MANY_SEEDS-}" ]; then
# Also run some many-seeds tests.
time for FILE in tests/many-seeds/*.rs; do
./miri run "--many-seeds=0..$MANY_SEEDS" "$FILE"
./miri run -v "--many-seeds=0..$MANY_SEEDS" "$FILE"
done
fi
if [ -n "${TEST_BENCH-}" ]; then
Expand Down Expand Up @@ -156,7 +156,7 @@ case $HOST_TARGET in
# Host
# With reduced many-seeds count as this is the slowest runner already.
# (The macOS runner checks windows-msvc with full many-seeds count.)
GC_STRESS=1 MIR_OPT=1 MANY_SEEDS=16 TEST_BENCH=1 run_tests
MANY_SEEDS=16 TEST_BENCH=1 run_tests
# Extra tier 1
# We really want to ensure a Linux target works on a Windows host,
# and a 64bit target works on a 32bit host.
Expand Down
2 changes: 1 addition & 1 deletion miri-script/src/commands.rs
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ impl Command {
let miri_flags = flagsplit(&miri_flags);
let toolchain = &e.toolchain;
let extra_flags = &e.cargo_extra_flags;
let quiet_flag = if verbose { None } else { Some("--quiet") };
let quiet_flag = if verbose { Some("-v") } else { Some("--quiet") };
// This closure runs the command with the given `seed_flag` added between the MIRIFLAGS and
// the `flags` given on the command-line.
let run_miri = |sh: &Shell, seed_flag: Option<String>| -> Result<()> {
Expand Down
2 changes: 1 addition & 1 deletion miri-script/src/util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ impl MiriEnv {
thread::scope(|s| {
let mut handles = Vec::new();
// Spawn one worker per core.
for _ in 0..thread::available_parallelism()?.get() {
for _ in 0..1 {
// Create a copy of the shell for this thread.
let local_shell = self.sh.clone();
let handle = s.spawn(|| -> Result<()> {
Expand Down

0 comments on commit e369256

Please sign in to comment.