Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

bug 629263 - fix order of preparing APP_PATH and testing for APP_PATH…

… in run_jetpack.sh p=lsblakk r=catlee
  • Loading branch information...
commit 864a261024e2b386bae0ee929acfd9ec784ead28 1 parent 2552c7f
@lsblakk lsblakk authored
Showing with 9 additions and 7 deletions.
  1. +9 −7 buildfarm/utils/run_jetpack.sh
View
16 buildfarm/utils/run_jetpack.sh
@@ -54,6 +54,14 @@ else
exit 1
fi
+if [ $# = 4 ]; then
+ # jetpack poller runs need to
+ # prepare (unzip, install, untar) the executable
+ if [ "$POLLER_CMD" ]; then
+ $POLLER_CMD
+ fi
+fi
+
# Make sure we have an app to run the test suite against
# Mac builds require getting the $APP_PATH after installing the dmg (for jetpack-poller)
if [ "$1" == 'macosx' -o "$1" == 'macosx64' -o "$1" == 'leopard' -o "$1" == 'snowleopard' ]; then
@@ -63,13 +71,7 @@ if [ ! -e "$APP_PATH" ]; then
echo "The location \"$APP_PATH\" does not exist"
exit 1
fi
-if [ $# = 4 ]; then
- # jetpack poller runs need to
- # prepare (unzip, install, untar) the executable
- if [ "$POLLER_CMD" ]; then
- $POLLER_CMD
- fi
-fi
+
# Run it!
tar -xvf $JETPACK_TARBALL $UNTAR_ARGS
# Find the sdk dir to run tests in
Please sign in to comment.
Something went wrong with that request. Please try again.