use trap to shutdown

ava-labs · Jan 9, 2023 · e95f50e · e95f50e
1 parent 84815ab
commit e95f50e
Showing 1 changed file with 8 additions and 11 deletions.
diff --git a/scripts/tests.e2e.sh b/scripts/tests.e2e.sh
@@ -158,6 +158,13 @@ server \
 #--disable-nodes-output \
 PID=${!}
 
+function cleanup()
+{
+  echo "shutting down network runner"
+  kill ${PID}
+}
+trap cleanup EXIT
+
 echo "running e2e tests"
 ./tests/e2e/e2e.test \
 --ginkgo.v \
@@ -167,14 +174,4 @@ echo "running e2e tests"
 --grpc-gateway-endpoint="0.0.0.0:8081" \
 --avalanchego-path-1=/tmp/avalanchego-v${VERSION_1}/avalanchego \
 --avalanchego-path-2=/tmp/avalanchego-v${VERSION_2}/avalanchego \
---subnet-evm-path=/tmp/subnet-evm-v${SUBNET_EVM_VERSION}/subnet-evm || EXIT_CODE=$?
-
-echo "shutting down network runner"
-kill ${PID}
-
-if [[ ${EXIT_CODE} == 0 ]]; then
-  echo "SUCCESS!"
-else
-  echo "FAILURE!"
-fi
-exit ${EXIT_CODE}
+--subnet-evm-path=/tmp/subnet-evm-v${SUBNET_EVM_VERSION}/subnet-evm