From b4efbf07f72152876fe5416fd3db0e600bbb8257 Mon Sep 17 00:00:00 2001
From: Yihau Chen <a122092487@gmail.com>
Date: Fri, 1 Sep 2023 19:45:00 +0800
Subject: [PATCH] ci: remove unstable options for stable tests (#33103)

---
 ci/stable/run-all.sh       |  6 +---
 ci/stable/run-partition.sh |  6 +---
 ci/test-stable.sh          | 70 ++++++++------------------------------
 3 files changed, 16 insertions(+), 66 deletions(-)

diff --git a/ci/stable/run-all.sh b/ci/stable/run-all.sh
index 4e2f474c9..2ac82325b 100644
--- a/ci/stable/run-all.sh
+++ b/ci/stable/run-all.sh
@@ -12,8 +12,4 @@ source "$here"/../common/limit-threads.sh
 #shellcheck source=ci/stable/common.sh
 source "$here"/common.sh
 
-if need_to_generate_test_result; then
-  _ cargo test --jobs "$JOBS" --workspace --tests --verbose -- -Z unstable-options --format json --report-time | tee results.json
-else
-  _ ci/intercept.sh cargo test --jobs "$JOBS" --workspace --tests --verbose -- --nocapture
-fi
+_ ci/intercept.sh cargo test --jobs "$JOBS" --workspace --tests --verbose -- --nocapture
diff --git a/ci/stable/run-partition.sh b/ci/stable/run-partition.sh
index df7744796..0c4738c80 100755
--- a/ci/stable/run-partition.sh
+++ b/ci/stable/run-partition.sh
@@ -46,11 +46,7 @@ if [ "$INDEX" -eq "$((LIMIT - 1))" ]; then
     ARGS+=(-p "$package")
   done
 
-  if need_to_generate_test_result; then
-    _ cargo test "${ARGS[@]}" --verbose -- -Z unstable-options --format json --report-time | tee results.json
-  else
-    _ cargo test "${ARGS[@]}"
-  fi
+  _ cargo test "${ARGS[@]}"
 else
   ARGS=(
     --profile ci
diff --git a/ci/test-stable.sh b/ci/test-stable.sh
index 0497a1cb6..a5783bc33 100755
--- a/ci/test-stable.sh
+++ b/ci/test-stable.sh
@@ -33,11 +33,7 @@ source ci/common/shared-functions.sh
 echo "Executing $testName"
 case $testName in
 test-stable)
-  if need_to_upload_test_result; then
-    _ cargo test --jobs "$JOBS" --all --tests --exclude solana-local-cluster ${V:+--verbose} -- -Z unstable-options --format json --report-time | tee results.json
-  else
-    _ ci/intercept.sh cargo test --jobs "$JOBS" --all --tests --exclude solana-local-cluster ${V:+--verbose} -- --nocapture
-  fi
+  _ ci/intercept.sh cargo test --jobs "$JOBS" --all --tests --exclude solana-local-cluster ${V:+--verbose} -- --nocapture
   ;;
 test-stable-sbf)
   # Clear the C dependency files, if dependency moves these files are not regenerated
@@ -73,15 +69,9 @@ test-stable-sbf)
 
   # SBF C program system tests
   _ make -C programs/sbf/c tests
-  if need_to_upload_test_result; then
-    _ cargo test \
-      --manifest-path programs/sbf/Cargo.toml \
-      --no-default-features --features=sbf_c,sbf_rust -- -Z unstable-options --format json --report-time | tee results.json
-  else
-    _ cargo test \
-      --manifest-path programs/sbf/Cargo.toml \
-      --no-default-features --features=sbf_c,sbf_rust -- --nocapture
-  fi
+  _ cargo test \
+    --manifest-path programs/sbf/Cargo.toml \
+    --no-default-features --features=sbf_c,sbf_rust -- --nocapture
 
   # SBF Rust program unit tests
   for sbf_test in programs/sbf/rust/*; do
@@ -114,18 +104,10 @@ test-stable-sbf)
 
   # SBF program instruction count assertion
   sbf_target_path=programs/sbf/target
-  if need_to_upload_test_result; then
-    _ cargo test \
-      --manifest-path programs/sbf/Cargo.toml \
-      --no-default-features --features=sbf_c,sbf_rust assert_instruction_count \
-      -- -Z unstable-options --format json --report-time |& tee results.json
-    awk '!/{ "type": .* }/' results.json >"${sbf_target_path}"/deploy/instuction_counts.txt
-  else
-    _ cargo test \
-      --manifest-path programs/sbf/Cargo.toml \
-      --no-default-features --features=sbf_c,sbf_rust assert_instruction_count \
-      -- --nocapture &> "${sbf_target_path}"/deploy/instuction_counts.txt
-  fi
+  _ cargo test \
+    --manifest-path programs/sbf/Cargo.toml \
+    --no-default-features --features=sbf_c,sbf_rust assert_instruction_count \
+    -- --nocapture &> "${sbf_target_path}"/deploy/instuction_counts.txt
 
   sbf_dump_archive="sbf-dumps.tar.bz2"
   rm -f "$sbf_dump_archive"
@@ -150,47 +132,27 @@ test-stable-perf)
   fi
 
   _ cargo build --bins ${V:+--verbose}
-  if need_to_upload_test_result; then
-    _ cargo test --package solana-perf --package solana-ledger --package solana-core --lib ${V:+--verbose} -- -Z unstable-options --format json --report-time | tee results.json
-  else
-    _ cargo test --package solana-perf --package solana-ledger --package solana-core --lib ${V:+--verbose} -- --nocapture
-  fi
+  _ cargo test --package solana-perf --package solana-ledger --package solana-core --lib ${V:+--verbose} -- --nocapture
   _ cargo run --manifest-path poh-bench/Cargo.toml ${V:+--verbose} -- --hashes-per-tick 10
   ;;
 test-local-cluster)
   _ cargo build --release --bins ${V:+--verbose}
-  if need_to_upload_test_result; then
-    _ cargo test --release --package solana-local-cluster --test local_cluster ${V:+--verbose} -- --test-threads=1 -Z unstable-options --format json --report-time | tee results.json
-  else
-    _ ci/intercept.sh cargo test --release --package solana-local-cluster --test local_cluster ${V:+--verbose} -- --nocapture --test-threads=1
-  fi
+  _ ci/intercept.sh cargo test --release --package solana-local-cluster --test local_cluster ${V:+--verbose} -- --nocapture --test-threads=1
   exit 0
   ;;
 test-local-cluster-flakey)
   _ cargo build --release --bins ${V:+--verbose}
-  if need_to_upload_test_result; then
-    _ cargo test --release --package solana-local-cluster --test local_cluster_flakey ${V:+--verbose} -- --test-threads=1 -Z unstable-options --format json --report-time | tee results.json
-  else
-    _ ci/intercept.sh cargo test --release --package solana-local-cluster --test local_cluster_flakey ${V:+--verbose} -- --nocapture --test-threads=1
-  fi
+  _ ci/intercept.sh cargo test --release --package solana-local-cluster --test local_cluster_flakey ${V:+--verbose} -- --nocapture --test-threads=1
   exit 0
   ;;
 test-local-cluster-slow-1)
   _ cargo build --release --bins ${V:+--verbose}
-  if need_to_upload_test_result; then
-    _ cargo test --release --package solana-local-cluster --test local_cluster_slow_1 ${V:+--verbose} -- --test-threads=1 -Z unstable-options --format json --report-time | tee results.json
-  else
-    _ ci/intercept.sh cargo test --release --package solana-local-cluster --test local_cluster_slow_1 ${V:+--verbose} -- --nocapture --test-threads=1
-  fi
+  _ ci/intercept.sh cargo test --release --package solana-local-cluster --test local_cluster_slow_1 ${V:+--verbose} -- --nocapture --test-threads=1
   exit 0
   ;;
 test-local-cluster-slow-2)
   _ cargo build --release --bins ${V:+--verbose}
-  if need_to_upload_test_result; then
-    _ cargo test --release --package solana-local-cluster --test local_cluster_slow_2 ${V:+--verbose} -- --test-threads=1 -Z unstable-options --format json --report-time | tee results.json
-  else
-    _ ci/intercept.sh cargo test --release --package solana-local-cluster --test local_cluster_slow_2 ${V:+--verbose} -- --nocapture --test-threads=1
-  fi
+  _ ci/intercept.sh cargo test --release --package solana-local-cluster --test local_cluster_slow_2 ${V:+--verbose} -- --nocapture --test-threads=1
   exit 0
   ;;
 test-wasm)
@@ -207,11 +169,7 @@ test-wasm)
   exit 0
   ;;
 test-docs)
-  if need_to_upload_test_result; then
-    _ cargo test --jobs "$JOBS" --all --doc --exclude solana-local-cluster ${V:+--verbose} -- -Z unstable-options --format json --report-time | tee results.json
-  else
-    _ cargo test --jobs "$JOBS" --all --doc --exclude solana-local-cluster ${V:+--verbose} -- --nocapture
-  fi
+  _ cargo test --jobs "$JOBS" --all --doc --exclude solana-local-cluster ${V:+--verbose} -- --nocapture
   exit 0
   ;;
 *)