From cd6736d70b46fdccf1f244472ed2c34cd2643ca6 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Tue, 18 Dec 2018 13:12:44 -0800
Subject: [PATCH] Remove duplication between test-stable{,-perf}.sh

---
 ci/test-stable-perf.sh | 41 +----------------------------------------
 ci/test-stable.sh      | 29 +++++++++++++++++------------
 2 files changed, 18 insertions(+), 52 deletions(-)

diff --git a/ci/test-stable-perf.sh b/ci/test-stable-perf.sh
index 2e0f3e546..b14191eef 100755
--- a/ci/test-stable-perf.sh
+++ b/ci/test-stable-perf.sh
@@ -3,48 +3,9 @@ set -e
 
 cd "$(dirname "$0")/.."
 
-# Clear cached json keypair files
-rm -rf "$HOME/.config/solana"
-
-# This job doesn't run within a container, try once to upgrade tooling on a
-# version check failure
-ci/version-check-with-upgrade.sh stable
-
-export RUST_BACKTRACE=1
-export RUSTFLAGS="-D warnings"
-
-_() {
-  echo "--- $*"
-  "$@"
-}
-
 ./fetch-perf-libs.sh
 # shellcheck source=/dev/null
 source ./target/perf-libs/env.sh
 
 FEATURES=bpf_c,cuda,erasure,chacha
-_ cargo build --all --verbose --features="$FEATURES"
-_ cargo test --all --verbose --features="$FEATURES" --lib -- --nocapture --test-threads=1
-
-# Run integration tests serially
-for test in tests/*.rs; do
-  test=${test##*/} # basename x
-  test=${test%.rs} # basename x .rs
-  _ cargo test --verbose --features="$FEATURES" --test="$test" -- --test-threads=1
-done
-
-# Run bpf_loader test with bpf_c features enabled
-(
-  set -x
-  cd "programs/native/bpf_loader"
-  echo --- program/native/bpf_loader test --features=bpf_c
-  cargo test --verbose --features="bpf_c"
-)
-
-echo --- ci/localnet-sanity.sh
-(
-  set -x
-  # Assume |cargo build| has populated target/debug/ successfully.
-  export PATH=$PWD/target/debug:$PATH
-  USE_INSTALL=1 ci/localnet-sanity.sh
-)
+exec ci/test-stable.sh "$FEATURES"
diff --git a/ci/test-stable.sh b/ci/test-stable.sh
index f2d934e89..0abead7be 100755
--- a/ci/test-stable.sh
+++ b/ci/test-stable.sh
@@ -1,9 +1,14 @@
 #!/usr/bin/env bash
 set -e
 
+FEATURES="$1"
+
 cd "$(dirname "$0")/.."
 
-ci/version-check.sh stable
+# Clear cached json keypair files
+rm -rf "$HOME/.config/solana"
+
+ci/version-check-with-upgrade.sh stable
 export RUST_BACKTRACE=1
 export RUSTFLAGS="-D warnings"
 
@@ -13,19 +18,12 @@ _() {
 }
 
 _ scripts/ulimit-n.sh
-_ cargo build --all --verbose
-_ cargo test --all --verbose --lib -- --nocapture --test-threads=1
+_ cargo build --all --verbose --features="$FEATURES"
+_ cargo test --all --verbose - --features="$FEATURES" --lib -- --nocapture --test-threads=1
 
-# Run integration tests serially
-for test in tests/*.rs; do
-  test=${test##*/} # basename x
-  test=${test%.rs} # basename x .rs
-  _ cargo test --verbose --test="$test" -- --test-threads=1 --nocapture
-done
-
-# Run native program tests
+# Run native program tests (without $FEATURES)
 for program in programs/native/*; do
-  echo --- "$program"
+  echo --- "$program" test
   (
     set -x
     cd "$program"
@@ -33,6 +31,13 @@ for program in programs/native/*; do
   )
 done
 
+# Run integration tests serially
+for test in tests/*.rs; do
+  test=${test##*/} # basename x
+  test=${test%.rs} # basename x .rs
+  _ cargo test --verbose --features="$FEATURES" --test="$test" -- --test-threads=1 --nocapture
+done
+
 echo --- ci/localnet-sanity.sh
 (
   set -x