Ensure that the cluster is stopped when exiting

contrib/Joshua/scripts/bindingTest.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-KILLSERVERS="${KILLSERVERS:-0}"
-if [ "${KILLSERVERS}" -gt 0 ]; then pkill fdbserver; fi
 ulimit -S -c unlimited
 
 unset FDB_NETWORK_OPTION_EXTERNAL_CLIENT_DIRECTORY

contrib/Joshua/scripts/bindingTestScript.sh

@@ -7,7 +7,7 @@ SCRIPTID="${$}"
 SAVEONERROR="${SAVEONERROR:-1}"
 PYTHONDIR="${BINDIR}/tests/python"
 testScript="${BINDIR}/tests/bindingtester/run_binding_tester.sh"
-VERSION="1.6"
+VERSION="1.7"
 
 source ${SCRIPTDIR}/localClusterStart.sh
 
@@ -36,6 +36,9 @@ fi
 # Begin the cluster using the logic in localClusterStart.sh.
 startCluster
 
+# Stop the cluster on exit
+trap "stopCluster" EXIT
+
 # Display user message
 if [ "${status}" -ne 0 ]; then
 	: