From eafd925cc670ff23283c5bd29cc94a48ff2ac5c7 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sat, 4 May 2024 09:35:20 +0200 Subject: [PATCH] show what happens durung many-seeds --- ci/ci.sh | 6 +++--- miri-script/src/commands.rs | 2 +- miri-script/src/util.rs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ci/ci.sh b/ci/ci.sh index c8c24ba5da..0abaf6c920 100755 --- a/ci/ci.sh +++ b/ci/ci.sh @@ -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 @@ -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 @@ -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. diff --git a/miri-script/src/commands.rs b/miri-script/src/commands.rs index 7e34ad050b..7cc4f314b4 100644 --- a/miri-script/src/commands.rs +++ b/miri-script/src/commands.rs @@ -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| -> Result<()> { diff --git a/miri-script/src/util.rs b/miri-script/src/util.rs index 23b5e936ed..373aec685a 100644 --- a/miri-script/src/util.rs +++ b/miri-script/src/util.rs @@ -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<()> {