@@ -19,6 +19,7 @@ for test_script in $test_scripts; do

 	echo "${STARTTIME} starting ${test_script}";

 	set +e

+	# use a subshell to prevent `exit` calls from killing this script

 	(${test_script})

 	CURR_RETURN=$?

 	set -e

@@ -23,14 +23,13 @@ export BASETMPDIR="${TMPDIR}/openshift-extended-tests/authentication"

 export EXTENDED_TEST_PATH="${OS_ROOT}/test/extended"

 export KUBE_REPO_ROOT="${OS_ROOT}/../../../k8s.io/kubernetes"

-function join { local IFS="$1"; shift; echo "$*"; }

-

-

 function cleanup()

 {

+	out=$?

 	docker rmi test/scratchimage

 	cleanup_openshift

 	echo "[INFO] Exiting"

+	return $out

 }

 trap "exit" INT TERM

@@ -98,7 +98,7 @@ if [[ -z ${TEST_ONLY+x} ]]; then

     out=$?

     cleanup_openshift

     echo "[INFO] Exiting"

-    exit $out

+    return $out

   }

   trap "exit" INT TERM

@@ -30,7 +30,7 @@ function cleanup()

 	out=$?

 	cleanup_openshift

 	echo "[INFO] Exiting"

-	exit $out

+	return $out

 }

 trap "exit" INT TERM