From 9f04d86bb53a6d9ac6446dba285dedd6fab67378 Mon Sep 17 00:00:00 2001
From: Mark Logan <103447440+mystenmark@users.noreply.github.com>
Date: Sun, 12 Mar 2023 10:46:52 -0700
Subject: [PATCH] Simplify env vars; don't run ignored tests (#9144)

---
 .github/workflows/simulator-nightly.yml | 2 --
 scripts/simtest/simtest-run.sh          | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/simulator-nightly.yml b/.github/workflows/simulator-nightly.yml
index 70e03a99a4521..0718ecc463a5f 100644
--- a/.github/workflows/simulator-nightly.yml
+++ b/.github/workflows/simulator-nightly.yml
@@ -38,8 +38,6 @@ jobs:
       RUST_LOG: off
       # Runs tests much faster - disables signing and verification
       USE_MOCK_CRYPTO: 1
-      MSIM_TEST_NUM: 30
-      SIM_STRESS_TEST_DURATION_SECS: 300
       CARGO_TERM_COLOR: always
 
     steps:
diff --git a/scripts/simtest/simtest-run.sh b/scripts/simtest/simtest-run.sh
index 494e4604f7e1b..29e59053a1ab7 100755
--- a/scripts/simtest/simtest-run.sh
+++ b/scripts/simtest/simtest-run.sh
@@ -18,6 +18,7 @@ SEED="$DATE"
 # TODO: this logs directly to stdout since it is not being run in parallel. is that ok?
 MSIM_TEST_SEED="$SEED" \
 MSIM_WATCHDOG_TIMEOUT_MS=60000 \
+MSIM_TEST_NUM=30 \
 scripts/simtest/cargo-simtest simtest \
   --package sui \
   --package sui-core \
@@ -35,11 +36,10 @@ for SUB_SEED in `seq 1 $NUM_CPUS`; do
 
   # --test-threads 1 is important: parallelism is achieved via the for loop
   MSIM_TEST_SEED="$SEED" \
-  MSIM_TEST_NUM=1 \
   MSIM_WATCHDOG_TIMEOUT_MS=60000 \
+  SIM_STRESS_TEST_DURATION_SECS=300 \
   scripts/simtest/cargo-simtest simtest \
     --package sui-benchmark \
-    --run-ignored all \
     --test-threads 1 \
     --profile simtestnightly \
     -E "$TEST_FILTER" > "$LOG_FILE" 2>&1 &