Merge pull request kubernetes#211 from lavalamp/test_fix

Fix jq detection (tested, works)
duda · Jun 24, 2014 · 91c8828 · 91c8828
2 parents c5c6084 + a446467
commit 91c8828
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/hack/e2e-test.sh b/hack/e2e-test.sh
@@ -22,16 +22,16 @@
 ALREADY_UP=${1:-0}
 LEAVE_UP=${2:-0}
 
-# Exit on error
-set -e
-
 HAVE_JQ=$(which jq)
 if [[ -z ${HAVE_JQ} ]]; then
   echo "Please install jq, e.g.: 'sudo apt-get install jq' or, "
   echo "if you're on a mac with homebrew, 'brew install jq'."
   exit 1
 fi
 
+# Exit on error
+set -e
+
 # Use testing config
 export KUBE_CONFIG_FILE="config-test.sh"
 export KUBE_REPO_ROOT="$(dirname $0)/.."