Merge lp:~thomir-deactivatedaccount/ubuntu-test-cases/touch-convert-boottest-to-spaces into lp:ubuntu-test-cases/touch

[Thomi Richards]

Convert tabs to spaces in scripts/*

Convert tabs to spaces in scripts/*

[Thomi Richards (thomir-deactivatedaccount)]

Convert tabs to spaces in scripts/*

[Francis Ginther (fginther)]

Just two nitpicks to adjust some comment lines. Otherwise, approve.

review: Approve

[lp:~thomir-deactivatedaccount/ubuntu-test-cases/touch-convert-boottest-to-spaces]

407. By Thomi Richards on 2015-06-03

realign comments.

[Thomi Richards (thomir-deactivatedaccount)]

review: Approve

=== modified file 'scripts/assert-image'
--- scripts/assert-image	2015-04-14 23:18:52 +0000
+++ scripts/assert-image	2015-06-03 20:47:10 +0000
@@ -12,20 +12,20 @@
 REQUIRED_UUID=$(curl ${INSTALL_URL}/artifact/clientlogs/.ci-uuid)
 ACTUAL_UUID=$(adb shell "cat /home/phablet/.ci-uuid | tr -d '\r\n'")
 if [ "$REQUIRED_UUID" != "$ACTUAL_UUID" ] ; then
-	echo "= UUIDs $REQUIRED_UUID != $ACTUAL_UUID"
-	SERVER=$(curl ${INSTALL_URL}/artifact/clientlogs/.ci-flash-server | tr -d '\r\n')
-	ARGS=$(curl ${INSTALL_URL}/artifact/clientlogs/.ci-flash-args | tr -d '\r\n')
-	CUST=$(curl ${INSTALL_URL}/artifact/clientlogs/.ci-customizations | tr -d '\r\n')
-	echo "reprovisioning device with: $ARGS"
-	echo "customizing device with: $CUST"
-        #Make the image writable if we reprovision by adding a space
-        #after to CUSTOMIZE so it is never empty
-	UUID=$REQUIRED_UUID IMAGE_SERVER=$SERVER IMAGE_OPT=$ARGS \
-		CUSTOMIZE="$CUST " ${BASEDIR}/scripts/provision.sh
+    echo "= UUIDs $REQUIRED_UUID != $ACTUAL_UUID"
+    SERVER=$(curl ${INSTALL_URL}/artifact/clientlogs/.ci-flash-server | tr -d '\r\n')
+    ARGS=$(curl ${INSTALL_URL}/artifact/clientlogs/.ci-flash-args | tr -d '\r\n')
+    CUST=$(curl ${INSTALL_URL}/artifact/clientlogs/.ci-customizations | tr -d '\r\n')
+    echo "reprovisioning device with: $ARGS"
+    echo "customizing device with: $CUST"
+    #Make the image writable if we reprovision by adding a space
+    #after to CUSTOMIZE so it is never empty
+    UUID=$REQUIRED_UUID IMAGE_SERVER=$SERVER IMAGE_OPT=$ARGS \
+        CUSTOMIZE="$CUST " ${BASEDIR}/scripts/provision.sh
 else
-	echo "= UUIDS match, reusing image on target"
-	echo $REQUIRED_UUID > clientlogs/.ci-uuid
-	curl ${INSTALL_URL}/artifact/clientlogs/.ci-flash-args > clientlogs/.ci-flash-args
-	curl ${INSTALL_URL}/artifact/clientlogs/.ci-customizations > clientlogs/.ci-customizations
+    echo "= UUIDS match, reusing image on target"
+    echo $REQUIRED_UUID > clientlogs/.ci-uuid
+    curl ${INSTALL_URL}/artifact/clientlogs/.ci-flash-args > clientlogs/.ci-flash-args
+    curl ${INSTALL_URL}/artifact/clientlogs/.ci-customizations > clientlogs/.ci-customizations
 fi
 

=== modified file 'scripts/boottest.sh'
--- scripts/boottest.sh	2015-06-03 14:41:46 +0000
+++ scripts/boottest.sh	2015-06-03 20:47:10 +0000
@@ -18,7 +18,7 @@
 # ../config/boottest.rc.example).
 BOOTTESTRC=${HOME}/.ubuntu-ci/boottest.rc
 if [ -f $BOOTTESTRC ]; then
-	source $BOOTTESTRC
+    source $BOOTTESTRC
 fi
 
 # Default adt-run timeout
@@ -38,11 +38,11 @@
 # Look for a known bug, lp1421009, that results in unity8 not starting
 # and prevents adt-run from accepting the testbed
 check_for_lp1421009() {
-	SYMPTOM="ERROR: timed out waiting for Unity greeter"
-	LINK="http://launchpad.net/bugs/1421009"
-	if [ $1 -eq 16 ] && grep -q "${SYMPTOM}" ${2}/log; then
-		END_MESSAGE="Test failed due to ${LINK}"
-	fi
+    SYMPTOM="ERROR: timed out waiting for Unity greeter"
+    LINK="http://launchpad.net/bugs/1421009"
+    if [ $1 -eq 16 ] && grep -q "${SYMPTOM}" ${2}/log; then
+        END_MESSAGE="Test failed due to ${LINK}"
+    fi
 }
 
 # Create an exit handler so that we are sure to create a error file even
@@ -163,22 +163,22 @@
 
 
 if [ -n "${FORCE_FAILURE}" ]; then
-	# Force a boottest failure by running an alternate DEP8 test
-	set +e
-	${ADT_CMD} --unbuilt-tree ${TESTS}/bootfail -o results ${ADT_OPTS}
-	RET=$?
-	set -e
+    # Force a boottest failure by running an alternate DEP8 test
+    set +e
+    ${ADT_CMD} --unbuilt-tree ${TESTS}/bootfail -o results ${ADT_OPTS}
+    RET=$?
+    set -e
 else
-	# Now execute the boot test
-	set +e
-	${BASEDIR}/scripts/run-adt.py ${ADT_CMD} --unbuilt-tree ${TESTS}/boottest -o results ${ADT_OPTS}
-	RET=$?
-	# Fetch the sourcepkg-version file that contains the version data
-	# for the package under test. We can't use the testpkg-version file
-	# that adt-run generates because it provides the version of the
-	# fake boottest package, not the package we're actually testing.
-	adb pull /home/phablet/sourcepkg-version results/sourcepkg-version
-	set -e
+    # Now execute the boot test
+    set +e
+    ${BASEDIR}/scripts/run-adt.py ${ADT_CMD} --unbuilt-tree ${TESTS}/boottest -o results ${ADT_OPTS}
+    RET=$?
+    # Fetch the sourcepkg-version file that contains the version data
+    # for the package under test. We can't use the testpkg-version file
+    # that adt-run generates because it provides the version of the
+    # fake boottest package, not the package we're actually testing.
+    adb pull /home/phablet/sourcepkg-version results/sourcepkg-version
+    set -e
 fi
 
 check_for_lp1421009 $RET results

=== modified file 'scripts/jenkins.sh'
--- scripts/jenkins.sh	2015-04-15 16:58:19 +0000
+++ scripts/jenkins.sh	2015-06-03 20:47:10 +0000
@@ -12,13 +12,13 @@
 
 
 usage() {
-	cat <<EOF
+    cat <<EOF
 usage: $0 -a APP [-s ANDROID_SERIAL] [-p FILE -p FILE ...] [-Q]
 
 Provisions the given device with the latest build
 
 OPTIONS:
-  -h	Show this message
+  -h    Show this message
   -s    Specify the serial of the device to install
   -a    The application under the "tests" directory to test
   -p    Extra file to pull from target (absolute path or relative to /home/phablet)
@@ -30,134 +30,134 @@
 PIDS=""
 
 cleanup() {
-	set +e
-	echo "killing child pids: $PIDS"
-	for p in $PIDS ; do
-		kill $p
-	done
+    set +e
+    echo "killing child pids: $PIDS"
+    for p in $PIDS ; do
+        kill $p
+    done
 }
 
 test_from_host() {
-	export PATH=${BASEDIR}/utils/host:${PATH}
-
-	# allow for certain commands to run from host/target
-	# see unity8-autopilot/ts_control for example
-	export TARGET_PREFIX=adb-shell
-
-	[ -z $ANDROID_SERIAL ] || ADBOPTS="-s $ANDROID_SERIAL"
-
-	# If we are not in the utah group, then we don't have permissions
-	# for /var/lib/utah, so run under sudo
-	if ! groups |grep -q utah ; then
-		SUDO="sudo"
-		sudo TARGET_PREFIX="${TARGET_PREFIX}" PATH="${PATH}" \
-			${UTAH_PHABLET_CMD} \
-			${ADBOPTS} \
-			--from-host \
-			--whoopsie \
-			--results-dir "${RESDIR}" \
-			--skip-install --skip-network --skip-utah \
-			--pull /var/crash \
-			--pull /home/phablet/.cache/upstart \
-			--pull /tmp/xmlresults \
-                	--pull /var/log/syslog \
-                	--pull /var/log/kern.log \
-                	--pull /var/log/upstart/whoopsie.log \
-			$EXTRA_PULL \
-			-l "${TESTSUITE_HOST}/master.run"
-	else
-		TARGET_PREFIX="${TARGET_PREFIX}" PATH="${PATH}" \
-			${UTAH_PHABLET_CMD} \
-			${ADBOPTS} \
-			--from-host \
-			--whoopsie \
-			--results-dir "${RESDIR}" \
-			--skip-install --skip-network --skip-utah \
-			--pull /var/crash \
-			--pull /home/phablet/.cache/upstart \
-			--pull /tmp/xmlresults \
-                	--pull /var/log/syslog \
-                	--pull /var/log/kern.log \
-                	--pull /var/log/upstart/whoopsie.log \
-			$EXTRA_PULL \
-			-l "${TESTSUITE_HOST}/master.run"
-	fi
-
-	# make sure the user running this script can remove its artifacts.
-	# only run this if we had to run under sudo
-	if [ "${SUDO}" = "sudo" ] ; then
-		sudo chown -R "${USER}" ${RESDIR}
-	fi
+    export PATH=${BASEDIR}/utils/host:${PATH}
+
+    # allow for certain commands to run from host/target
+    # see unity8-autopilot/ts_control for example
+    export TARGET_PREFIX=adb-shell
+
+    [ -z $ANDROID_SERIAL ] || ADBOPTS="-s $ANDROID_SERIAL"
+
+    # If we are not in the utah group, then we don't have permissions
+    # for /var/lib/utah, so run under sudo
+    if ! groups |grep -q utah ; then
+        SUDO="sudo"
+        sudo TARGET_PREFIX="${TARGET_PREFIX}" PATH="${PATH}" \
+            ${UTAH_PHABLET_CMD} \
+            ${ADBOPTS} \
+            --from-host \
+            --whoopsie \
+            --results-dir "${RESDIR}" \
+            --skip-install --skip-network --skip-utah \
+            --pull /var/crash \
+            --pull /home/phablet/.cache/upstart \
+            --pull /tmp/xmlresults \
+                    --pull /var/log/syslog \
+                    --pull /var/log/kern.log \
+                    --pull /var/log/upstart/whoopsie.log \
+            $EXTRA_PULL \
+            -l "${TESTSUITE_HOST}/master.run"
+    else
+        TARGET_PREFIX="${TARGET_PREFIX}" PATH="${PATH}" \
+            ${UTAH_PHABLET_CMD} \
+            ${ADBOPTS} \
+            --from-host \
+            --whoopsie \
+            --results-dir "${RESDIR}" \
+            --skip-install --skip-network --skip-utah \
+            --pull /var/crash \
+            --pull /home/phablet/.cache/upstart \
+            --pull /tmp/xmlresults \
+                    --pull /var/log/syslog \
+                    --pull /var/log/kern.log \
+                    --pull /var/log/upstart/whoopsie.log \
+            $EXTRA_PULL \
+            -l "${TESTSUITE_HOST}/master.run"
+    fi
+
+    # make sure the user running this script can remove its artifacts.
+    # only run this if we had to run under sudo
+    if [ "${SUDO}" = "sudo" ] ; then
+        sudo chown -R "${USER}" ${RESDIR}
+    fi
 }
 
 assert_image() {
-	[ -z $INSTALL_URL ] && return
-	echo "Ensuring target has proper image..."
-	REQUIRED_UUID=$(curl ${INSTALL_URL}/artifact/clientlogs/.ci-uuid)
-	ACTUAL_UUID=$(adb shell "cat /home/phablet/.ci-uuid | tr -d '\r\n'")
-	if [ "$REQUIRED_UUID" != "$ACTUAL_UUID" ] ; then
-		echo "UUIDs $REQUIRED_UUID != $ACTUAL_UUID, reprovisioning device..."
-		ARGS=$(curl ${INSTALL_URL}/artifact/clientlogs/.ci-utah-args | tr -d '\r\n')
-		SERVER=$(curl ${INSTALL_URL}/artifact/clientlogs/.ci-flash-server | tr -d '\r\n')
-		UUID=$REQUIRED_UUID IMAGE_SERVER=$SERVER IMAGE_OPT=$ARGS \
-			${BASEDIR}/scripts/provision.sh
-	else
-		echo "UUIDS match"
-	fi
+    [ -z $INSTALL_URL ] && return
+    echo "Ensuring target has proper image..."
+    REQUIRED_UUID=$(curl ${INSTALL_URL}/artifact/clientlogs/.ci-uuid)
+    ACTUAL_UUID=$(adb shell "cat /home/phablet/.ci-uuid | tr -d '\r\n'")
+    if [ "$REQUIRED_UUID" != "$ACTUAL_UUID" ] ; then
+        echo "UUIDs $REQUIRED_UUID != $ACTUAL_UUID, reprovisioning device..."
+        ARGS=$(curl ${INSTALL_URL}/artifact/clientlogs/.ci-utah-args | tr -d '\r\n')
+        SERVER=$(curl ${INSTALL_URL}/artifact/clientlogs/.ci-flash-server | tr -d '\r\n')
+        UUID=$REQUIRED_UUID IMAGE_SERVER=$SERVER IMAGE_OPT=$ARGS \
+            ${BASEDIR}/scripts/provision.sh
+    else
+        echo "UUIDS match"
+    fi
 }
 
 main() {
-	rm -rf $RESDIR
-	mkdir $RESDIR
-
-	assert_image
-
-	# print the build date so the jenkins job can use it as the
-	# build description
-	adb pull /var/log/installer/media-info ${RESDIR}
-	BUILDID=$(adb shell cat /home/phablet/.ci-version)
-	echo "= TOUCH IMAGE VERSION:$BUILDID"
-
-	adb shell "top -n1 -b" > ${RESDIR}/top.log
-
-	set -x
-	adb shell 'sudo rm -f /var/crash/*'
-	if [ -z $QUICK ] ; then
-		# get the phone in sane place
-		adb reboot
-		# sometimes reboot doesn't happen fast enough, so add a little
-		# delay to help ensure its actually rebooted and we didn't just
-		# connect back to the device before it rebooted
-		adb wait-for-device
-		sleep 5
-		adb wait-for-device
-		phablet-network --skip-setup -t 90s
-		adb shell sudo powerd-cli active &
-		PIDS="$PIDS $!"
-		adb shell sudo powerd-cli display on &
-		PIDS="$PIDS $!"
-	else
-		echo "SKIPPING phone reboot..."
-	fi
-
-	${BASEDIR}/utils/host/adb-shell "sudo aa-clickhook -f --include=/usr/share/autopilot-touch/apparmor/click.rules"
-
-	echo "launching test from the host...."
-	test_from_host
-	adb shell 'sudo rm -f /var/crash/*'
-
-	if ! `grep "^errors: [!0]" < $UTAHFILE >/dev/null` ; then
-		echo "errors found"
-		EXITCODE=1
-	fi
-	if ! `grep "^failures: [!0]" < $UTAHFILE >/dev/null` ; then
-		echo "failures found"
-		EXITCODE=2
-	fi
-	echo "Results Summary"
-	echo "---------------"
-	egrep '^(errors|failures|passes|fetch_errors):' $UTAHFILE
-	exit $EXITCODE
+    rm -rf $RESDIR
+    mkdir $RESDIR
+
+    assert_image
+
+    # print the build date so the jenkins job can use it as the
+    # build description
+    adb pull /var/log/installer/media-info ${RESDIR}
+    BUILDID=$(adb shell cat /home/phablet/.ci-version)
+    echo "= TOUCH IMAGE VERSION:$BUILDID"
+
+    adb shell "top -n1 -b" > ${RESDIR}/top.log
+
+    set -x
+    adb shell 'sudo rm -f /var/crash/*'
+    if [ -z $QUICK ] ; then
+        # get the phone in sane place
+        adb reboot
+        # sometimes reboot doesn't happen fast enough, so add a little
+        # delay to help ensure its actually rebooted and we didn't just
+        # connect back to the device before it rebooted
+        adb wait-for-device
+        sleep 5
+        adb wait-for-device
+        phablet-network --skip-setup -t 90s
+        adb shell sudo powerd-cli active &
+        PIDS="$PIDS $!"
+        adb shell sudo powerd-cli display on &
+        PIDS="$PIDS $!"
+    else
+        echo "SKIPPING phone reboot..."
+    fi
+
+    ${BASEDIR}/utils/host/adb-shell "sudo aa-clickhook -f --include=/usr/share/autopilot-touch/apparmor/click.rules"
+
+    echo "launching test from the host...."
+    test_from_host
+    adb shell 'sudo rm -f /var/crash/*'
+
+    if ! `grep "^errors: [!0]" < $UTAHFILE >/dev/null` ; then
+        echo "errors found"
+        EXITCODE=1
+    fi
+    if ! `grep "^failures: [!0]" < $UTAHFILE >/dev/null` ; then
+        echo "failures found"
+        EXITCODE=2
+    fi
+    echo "Results Summary"
+    echo "---------------"
+    egrep '^(errors|failures|passes|fetch_errors):' $UTAHFILE
+    exit $EXITCODE
 }
 
 while getopts p:s:a:Qh opt; do
@@ -172,20 +172,20 @@
     a)
         APP=$OPTARG
         ;;
-	p)
-		EXTRA_PULL_FILE=$OPTARG
-
-		if [ ! -z $EXTRA_PULL_FILE ]; then
-			# relative paths are assumed to be relative to /home/phablet
-			E_P_START=`echo $EXTRA_PULL_FILE | cut -c1`
-
-			if [ $E_P_START = '/' ]; then
-				EXTRA_PULL="$EXTRA_PULL --pull $EXTRA_PULL_FILE"
-			else
-				EXTRA_PULL="$EXTRA_PULL --pull /home/phablet/$EXTRA_PULL_FILE"
-			fi
-		fi
-		;;
+    p)
+        EXTRA_PULL_FILE=$OPTARG
+
+        if [ ! -z $EXTRA_PULL_FILE ]; then
+            # relative paths are assumed to be relative to /home/phablet
+            E_P_START=`echo $EXTRA_PULL_FILE | cut -c1`
+
+            if [ $E_P_START = '/' ]; then
+                EXTRA_PULL="$EXTRA_PULL --pull $EXTRA_PULL_FILE"
+            else
+                EXTRA_PULL="$EXTRA_PULL --pull /home/phablet/$EXTRA_PULL_FILE"
+            fi
+        fi
+        ;;
     Q)
         QUICK=1
         ;;
@@ -197,7 +197,7 @@
     lines=$(adb devices | wc -l)
     if [ $lines -gt 3 ] ; then
         echo "ERROR: More than one device attached, please use -s option"
-	echo
+    echo
         usage
         exit 1
     fi

=== modified file 'scripts/provision.sh'
--- scripts/provision.sh	2015-06-01 17:26:16 +0000
+++ scripts/provision.sh	2015-06-03 20:47:10 +0000
@@ -23,7 +23,7 @@
 Provisions the given device with the latest build
 
 OPTIONS:
-  -h	Show this message
+  -h    Show this message
   -s    Specify the serial of the device to install
   -n    Select network file
   -P    add the ppa to the target (can be repeated)
@@ -36,94 +36,94 @@
 }
 
 image_info() {
-	# mark the version we installed in /home/phablet/.ci-[uuid,flash-args]
-	# adb shell messes up \n's with \r\n's so do the whole of the regex on the target
-	IMAGEVER=$(adb shell "sudo system-image-cli -i | sed -n -e 's/version version: \([0-9]*\)/\1/p' -e 's/version ubuntu: \([0-9]*\)/\1/p' -e 's/version device: \([0-9]*\)/\1/p' | paste -s -d:")
-	CHAN=$(adb shell "sudo system-image-cli -i | sed -n -e 's/channel: \(.*\)/\1/p' | paste -s -d:")
-	REV=$(echo $IMAGEVER | cut -d: -f1)
-	echo "$IMAGE_OPT" | grep -q "\-\-revision" || REVISION="--revision=${REV}"
-	echo "$IMAGE_OPT" | grep -q "\-\-channel" || IMAGE_OPT="${IMAGE_OPT} --channel $CHAN"
-	adb shell "echo '${IMAGEVER}' > /home/phablet/.ci-version"
-	echo $UUID > $RESDIR/.ci-uuid
-	adb push $RESDIR/.ci-uuid /home/phablet/
-	cat > $RESDIR/.ci-flash-args <<EOF
+    # mark the version we installed in /home/phablet/.ci-[uuid,flash-args]
+    # adb shell messes up \n's with \r\n's so do the whole of the regex on the target
+    IMAGEVER=$(adb shell "sudo system-image-cli -i | sed -n -e 's/version version: \([0-9]*\)/\1/p' -e 's/version ubuntu: \([0-9]*\)/\1/p' -e 's/version device: \([0-9]*\)/\1/p' | paste -s -d:")
+    CHAN=$(adb shell "sudo system-image-cli -i | sed -n -e 's/channel: \(.*\)/\1/p' | paste -s -d:")
+    REV=$(echo $IMAGEVER | cut -d: -f1)
+    echo "$IMAGE_OPT" | grep -q "\-\-revision" || REVISION="--revision=${REV}"
+    echo "$IMAGE_OPT" | grep -q "\-\-channel" || IMAGE_OPT="${IMAGE_OPT} --channel $CHAN"
+    adb shell "echo '${IMAGEVER}' > /home/phablet/.ci-version"
+    echo $UUID > $RESDIR/.ci-uuid
+    adb push $RESDIR/.ci-uuid /home/phablet/
+    cat > $RESDIR/.ci-flash-args <<EOF
 $IMAGE_OPT
 EOF
-	adb push $RESDIR/.ci-flash-args /home/phablet/.ci-flash-args
-	cat > $RESDIR/.ci-flash-server <<EOF
+    adb push $RESDIR/.ci-flash-args /home/phablet/.ci-flash-args
+    cat > $RESDIR/.ci-flash-server <<EOF
 $IMAGE_SERVER
 EOF
-	adb push $RESDIR/.ci-flash-args /home/phablet/.ci-flash-server
-	echo $CUSTOMIZE > $RESDIR/.ci-customizations
-	adb push $RESDIR/.ci-customizations /home/phablet/.ci-customizations
+    adb push $RESDIR/.ci-flash-args /home/phablet/.ci-flash-server
+    echo $CUSTOMIZE > $RESDIR/.ci-customizations
+    adb push $RESDIR/.ci-customizations /home/phablet/.ci-customizations
 }
 
 log() {
-	echo = $(date): $*
+    echo = $(date): $*
 }
 
 set_hwclock() {
-	log "SETTING HWCLOCK TO CURRENT TIME"
+    log "SETTING HWCLOCK TO CURRENT TIME"
         # Use ip for ntp.ubuntu.com in case resolving doesn't work yet
-	adb-shell sudo ntpdate 91.189.94.4 || log "WARNING: could not set ntpdate"
-	# hwclock sync has to happen after we set writable image
-	adb-shell sudo hwclock -w || log "WARNING: could not sync hwclock"
-	log "Current date on device is:"
-	adb shell date
-	log "Current hwclock on device is:"
-	adb shell sudo hwclock
+    adb-shell sudo ntpdate 91.189.94.4 || log "WARNING: could not set ntpdate"
+    # hwclock sync has to happen after we set writable image
+    adb-shell sudo hwclock -w || log "WARNING: could not sync hwclock"
+    log "Current date on device is:"
+    adb shell date
+    log "Current hwclock on device is:"
+    adb shell sudo hwclock
 }
 
 retry() {
-	timeout=$1
-	shift
-	loops=$1
-	shift
-	cmd=$*
-	loopcnt=0
-	while true; do
-		$cmd && break || {
-			if [ $loopcnt -lt $loops ] ; then
-				loopcnt=$[$loopcnt+1]
-				echo "Retry [$loopcnt/$loops] after $timeout seconds..."
-				sleep $timeout
-			else
-				echo Failed on \'$cmd\' after $loops retries
-				exit 1
-			fi
-		}
-	done
+    timeout=$1
+    shift
+    loops=$1
+    shift
+    cmd=$*
+    loopcnt=0
+    while true; do
+        $cmd && break || {
+            if [ $loopcnt -lt $loops ] ; then
+                loopcnt=$[$loopcnt+1]
+                echo "Retry [$loopcnt/$loops] after $timeout seconds..."
+                sleep $timeout
+            else
+                echo Failed on \'$cmd\' after $loops retries
+                exit 1
+            fi
+        }
+    done
 }
 
 reboot_bootloader() {
-	# In CI, we've seen cases where 'adb reboot bootloader' will just
-	# reboot the device and not enter the bootloader. Adding another
-	# reboot and retrying was found to be a successful workaround:
-	# https://bugs.launchpad.net/ubuntu/+source/android-tools/+bug/1359488
-	#
-	# We only want to do this if we know ANDROID_SERIAL. Attempting
-	# to guess might end up flashing the wrong device.
+    # In CI, we've seen cases where 'adb reboot bootloader' will just
+    # reboot the device and not enter the bootloader. Adding another
+    # reboot and retrying was found to be a successful workaround:
+    # https://bugs.launchpad.net/ubuntu/+source/android-tools/+bug/1359488
+    #
+    # We only want to do this if we know ANDROID_SERIAL. Attempting
+    # to guess might end up flashing the wrong device.
 
-	log "Attempting adb reboot bootloader"
-	adb reboot bootloader
-	if [ -n "${ANDROID_SERIAL}" ] ; then
-	       	# Entering the bootloader should take < 10 seconds, add some
-		# padding for device variance.
-		sleep 30
-		if ! fastboot devices | grep -q "${ANDROID_SERIAL}"; then
-			log "Device not in fastboot after adb reboot bootloader"
-			# After a failed 'reboot bootloader' attempt, a reboot
-			# is used to get the device back to a saner state.
-			adb reboot
-			return 1
-		fi
-	fi
-	return 0
+    log "Attempting adb reboot bootloader"
+    adb reboot bootloader
+    if [ -n "${ANDROID_SERIAL}" ] ; then
+        # Entering the bootloader should take < 10 seconds, add some
+        # padding for device variance.
+        sleep 30
+        if ! fastboot devices | grep -q "${ANDROID_SERIAL}"; then
+            log "Device not in fastboot after adb reboot bootloader"
+            # After a failed 'reboot bootloader' attempt, a reboot
+            # is used to get the device back to a saner state.
+            adb reboot
+            return 1
+        fi
+    fi
+    return 0
 }
 
 download_recovery () {
-	# FIXME: ev mentioned on irc that we should add some cheksum for
-	# those images -- vila 2015-02-20
+    # FIXME: ev mentioned on irc that we should add some cheksum for
+    # those images -- vila 2015-02-20
         wget -P recovery ${RECOVERY_URL}/recovery-${DEVICE_TYPE}.img
         if [ -f recovery/recovery-${DEVICE_TYPE}.img ]; then
                 RECOVERY="--recovery-image=recovery/recovery-${DEVICE_TYPE}.img"
@@ -133,80 +133,80 @@
 }
 
 full_flash() {
-	log "FLASHING DEVICE"
-	DEVICE_TYPE=$(get-device-type)
-	# Use a 60 second retry loop for reboot_bootloader.
-	# If the attempt failed, it may take nearly 60 seconds to complete
-	# the reboot cycle to get the device back to a sane state.
-	retry 60 3 reboot_bootloader
-	RECOVERY=""
-	# We need to distinguish between devices with no recovery images and
-	# failures to download existing recovery images. Only krillin
+    log "FLASHING DEVICE"
+    DEVICE_TYPE=$(get-device-type)
+    # Use a 60 second retry loop for reboot_bootloader.
+    # If the attempt failed, it may take nearly 60 seconds to complete
+    # the reboot cycle to get the device back to a sane state.
+    retry 60 3 reboot_bootloader
+    RECOVERY=""
+    # We need to distinguish between devices with no recovery images and
+    # failures to download existing recovery images. Only krillin
         # and arale have a recovery image for now.
-	if [ "${DEVICE_TYPE}" == 'krillin' ] || 
-	   [ "${DEVICE_TYPE}" == 'arale' ]; then
-		mkdir -p recovery
-		retry 10 3 download_recovery
-	fi
-	# Use a 10 second retry loop for ubuntu-device-flash.
-	# Most failures appear to be transient and work with an immediate
-	# retry.
-	retry 10 3 timeout 1800 ubuntu-device-flash ${IMAGE_SERVER} ${REVISION} touch ${RECOVERY} --password $PHABLET_PASSWORD $IMAGE_OPT
-	# If the flashed image fails to install and reboots, wait-for-device
-	# will timeout
-	timeout 600 adb wait-for-device
-	sleep 60  #give the system a little time
+    if [ "${DEVICE_TYPE}" == 'krillin' ] || 
+       [ "${DEVICE_TYPE}" == 'arale' ]; then
+        mkdir -p recovery
+        retry 10 3 download_recovery
+    fi
+    # Use a 10 second retry loop for ubuntu-device-flash.
+    # Most failures appear to be transient and work with an immediate
+    # retry.
+    retry 10 3 timeout 1800 ubuntu-device-flash ${IMAGE_SERVER} ${REVISION} touch ${RECOVERY} --password $PHABLET_PASSWORD $IMAGE_OPT
+    # If the flashed image fails to install and reboots, wait-for-device
+    # will timeout
+    timeout 600 adb wait-for-device
+    sleep 60  #give the system a little time
 }
 
 while getopts i:s:n:P:D:p:r:wh opt; do
-	case $opt in
-	h)
-		usage
-		exit 0
-		;;
-	n)
-		NETWORK_FILE=$OPTARG
-		;;
-	s)
-		export ANDROID_SERIAL=$OPTARG
-		;;
-	i)
-		IMAGE_TYPE=$OPTARG
-		;;
-	w)
-		# making this a non-zero length string enables the logic
-		CUSTOMIZE=" "
-		;;
-	P)
-		CUSTOMIZE="$CUSTOMIZE --ppa $OPTARG"
-		;;
-	D)
-		CUSTOMIZE="$CUSTOMIZE --package-dir $OPTARG"
-		;;
-	p)
-		CUSTOMIZE="$CUSTOMIZE -p $OPTARG"
-		;;
-	r)
+    case $opt in
+    h)
+        usage
+        exit 0
+        ;;
+    n)
+        NETWORK_FILE=$OPTARG
+        ;;
+    s)
+        export ANDROID_SERIAL=$OPTARG
+        ;;
+    i)
+        IMAGE_TYPE=$OPTARG
+        ;;
+    w)
+        # making this a non-zero length string enables the logic
+        CUSTOMIZE=" "
+        ;;
+    P)
+        CUSTOMIZE="$CUSTOMIZE --ppa $OPTARG"
+        ;;
+    D)
+        CUSTOMIZE="$CUSTOMIZE --package-dir $OPTARG"
+        ;;
+    p)
+        CUSTOMIZE="$CUSTOMIZE -p $OPTARG"
+        ;;
+    r)
                 REVISION="--revision=$OPTARG"
-		;;
+        ;;
 
-	esac
+    esac
 done
 
 if [ -z $ANDROID_SERIAL ] ; then
-	# ensure we only have one device attached
-	lines=$(adb devices | wc -l)
-	if [ $lines -gt 3 ] ; then
-		echo "ERROR: More than one device attached, please use -s option"
-		echo
-		usage
-		exit 1
-	fi
+    # ensure we only have one device attached
+    lines=$(adb devices | wc -l)
+    if [ $lines -gt 3 ] ; then
+        echo "ERROR: More than one device attached, please use -s option"
+        echo
+        usage
+        exit 1
+    fi
 fi
 
 if [ ! -f $NETWORK_FILE ] && [ -z $USE_EMULATOR ] ; then
-	echo "ERROR: NETWORK_FILE, $NETWORK_FILE, not found"
-	exit 1
+    echo "ERROR: NETWORK_FILE, $NETWORK_FILE, not found"
+    exit 1
 fi
 
 set -x
@@ -214,25 +214,25 @@
 mkdir -p $RESDIR
 
 if [ -z $USE_EMULATOR ] ; then
-	full_flash
+    full_flash
 else
-	log "CREATING EMULATOR"
-	ubuntu-emulator destroy --yes $ANDROID_SERIAL || true
-	sudo ubuntu-emulator create $ANDROID_SERIAL $IMAGE_OPT
-	${BASEDIR}/reboot-and-wait
+    log "CREATING EMULATOR"
+    ubuntu-emulator destroy --yes $ANDROID_SERIAL || true
+    sudo ubuntu-emulator create $ANDROID_SERIAL $IMAGE_OPT
+    ${BASEDIR}/reboot-and-wait
 fi
 
 if [ -z $USE_EMULATOR ] ; then
-	log "SETTING UP WIFI"
-	retry 60 5 adb-shell 'sudo -iu phablet env |grep UPSTART_SESSION=unix'
-	retry 60 5 phablet-network -n $NETWORK_FILE
+    log "SETTING UP WIFI"
+    retry 60 5 adb-shell 'sudo -iu phablet env |grep UPSTART_SESSION=unix'
+    retry 60 5 phablet-network -n $NETWORK_FILE
 fi
 
 phablet-config welcome-wizard --disable
 
 if [ -n "$CUSTOMIZE" ] ; then
-	log "CUSTOMIZING IMAGE"
-	phablet-config writable-image -r ${PHABLET_PASSWORD} $CUSTOMIZE
+    log "CUSTOMIZING IMAGE"
+    phablet-config writable-image -r ${PHABLET_PASSWORD} $CUSTOMIZE
 fi
 
 log "SETTING UP SUDO"
@@ -243,20 +243,20 @@
 adb shell "sudo dbus-send --system --print-reply --dest=org.freedesktop.Accounts /org/freedesktop/Accounts/User32011 org.freedesktop.DBus.Properties.Set string:com.canonical.unity.AccountsService string:demo-edges variant:boolean:false"
 
 if [ -n "${SKIP_CLICK}" ]; then
-	log "SKIPPING CLICK PACKAGE SETUP AS REQUESTED"
+    log "SKIPPING CLICK PACKAGE SETUP AS REQUESTED"
 else
-	log "SETTING UP CLICK PACKAGES"
-	CLICK_TEST_OPTS=""
-	channel_name=$(adb shell "sudo system-image-cli -i | sed -n -e 's/channel: \(.*\)/\1/p' | paste -s -d:")
-	# Before running phablet-click-test setup, we need to make sure the
-	# session is available
-	retry 60 5 adb-shell 'sudo -iu phablet env |grep UPSTART_SESSION=unix'
+    log "SETTING UP CLICK PACKAGES"
+    CLICK_TEST_OPTS=""
+    channel_name=$(adb shell "sudo system-image-cli -i | sed -n -e 's/channel: \(.*\)/\1/p' | paste -s -d:")
+    # Before running phablet-click-test setup, we need to make sure the
+    # session is available
+    retry 60 5 adb-shell 'sudo -iu phablet env |grep UPSTART_SESSION=unix'
 
-	# FIXME: workaround for phablet-click-test-setup to pull the right sources
-	if [[ $channel_name == *rtm* ]] ; then
-		CLICK_TEST_OPTS="--distribution ubuntu-rtm --series 14.09"
-	fi
-	phablet-click-test-setup $CLICK_TEST_OPTS
+    # FIXME: workaround for phablet-click-test-setup to pull the right sources
+    if [[ $channel_name == *rtm* ]] ; then
+        CLICK_TEST_OPTS="--distribution ubuntu-rtm --series 14.09"
+    fi
+    phablet-click-test-setup $CLICK_TEST_OPTS
 fi
 
 # get our target-based utilities into our PATH

=== modified file 'scripts/run-autopilot-tests.sh'
--- scripts/run-autopilot-tests.sh	2015-04-15 17:27:08 +0000
+++ scripts/run-autopilot-tests.sh	2015-06-03 20:47:10 +0000
@@ -10,13 +10,13 @@
 
 
 usage() {
-	cat <<EOF
+    cat <<EOF
 usage: $0 -a APP [-s ANDROID_SERIAL] [-Q] [-o results_dir] [-S]
 
 Runs a set of autopilot tests on the target
 
 OPTIONS:
-  -h	Show this message
+  -h    Show this message
   -s    Specify the serial of the device to test
   -a    The application to test (can be repeated)
   -o    Specify the directory to place results in.
@@ -28,240 +28,240 @@
 }
 
 log_error() {
-	echo ERROR: $* >> ${RESDIR}/runner-errors.txt
+    echo ERROR: $* >> ${RESDIR}/runner-errors.txt
 }
 
 setup_test() {
-	app=$1
-	label=$2
-	odir=$3
-	{
-		pkgs=$(${BASEDIR}/jenkins/testconfig.py packages -a $app)
-		if [ "$label" = "setup" ] ; then
-			if [ -z "${SKIP_TESTCONFIG}" ]; then
-				adb-shell sudo apt-get install -yq --force-yes $pkgs
-			fi
-		else
-			if [ -z "${SKIP_TESTCONFIG}" ]; then
-				#Always remove dbus-x11 because it causes
-				#problems when we leave it around
-				pkgs="$pkgs dbus-x11"
-				adb-shell sudo apt-get autoremove --purge -y $pkgs || /bin/true
-			fi
-		fi
-		echo $? > ${odir}/setup_${label}.rc
-	} 2>&1 | tee ${odir}/setup_${label}.log
+    app=$1
+    label=$2
+    odir=$3
+    {
+        pkgs=$(${BASEDIR}/jenkins/testconfig.py packages -a $app)
+        if [ "$label" = "setup" ] ; then
+            if [ -z "${SKIP_TESTCONFIG}" ]; then
+                adb-shell sudo apt-get install -yq --force-yes $pkgs
+            fi
+        else
+            if [ -z "${SKIP_TESTCONFIG}" ]; then
+                #Always remove dbus-x11 because it causes
+                #problems when we leave it around
+                pkgs="$pkgs dbus-x11"
+                adb-shell sudo apt-get autoremove --purge -y $pkgs || /bin/true
+            fi
+        fi
+        echo $? > ${odir}/setup_${label}.rc
+    } 2>&1 | tee ${odir}/setup_${label}.log
 }
 
 system_settle() {
-	[ -z $NOSETTLE ] || return 0
-
-	label=$1
-	odir=$2
-	rc=0
-	timeout=120s
-	if [ "$label" = "before" ] ; then
-		timeout=300s
-	fi
-
-	settle=${BASEDIR}/tests/systemsettle/systemsettle.sh
-	{
-		export UTAH_PROBE_DIR=${odir}  # needed for log file location
-		timeout $timeout $settle -c5 -d6 -p 95 -l $label || rc=1
-		echo $rc > ${odir}/settle_${label}.rc
-	} 2>&1 | tee ${odir}/settle_${label}.log
+    [ -z $NOSETTLE ] || return 0
+
+    label=$1
+    odir=$2
+    rc=0
+    timeout=120s
+    if [ "$label" = "before" ] ; then
+        timeout=300s
+    fi
+
+    settle=${BASEDIR}/tests/systemsettle/systemsettle.sh
+    {
+        export UTAH_PROBE_DIR=${odir}  # needed for log file location
+        timeout $timeout $settle -c5 -d6 -p 95 -l $label || rc=1
+        echo $rc > ${odir}/settle_${label}.rc
+    } 2>&1 | tee ${odir}/settle_${label}.log
 }
 
 test_app() {
-	app=$1
-
-	odir=${RESDIR}/${app}
-	[ -d $odir ] && rm -rf $odir
-	mkdir -p $odir || return 1
-
-	system_settle before $odir
-	phablet-config autopilot --dbus-probe enable || \
-		(log_error "'autopilot dbus-probe enable' failed"; return 1)
-	adb-shell /home/phablet/bin/check-clickhook-rules || \
-		(log_error "some click profiles missing autopilot rules")
-
-	setup_test $app setup $odir
-
-	NOSHELL=""
-	[ "$app" = "unity8" ] && NOSHELL="-n"
-	EXTRA=""
+    app=$1
+
+    odir=${RESDIR}/${app}
+    [ -d $odir ] && rm -rf $odir
+    mkdir -p $odir || return 1
+
+    system_settle before $odir
+    phablet-config autopilot --dbus-probe enable || \
+        (log_error "'autopilot dbus-probe enable' failed"; return 1)
+    adb-shell /home/phablet/bin/check-clickhook-rules || \
+        (log_error "some click profiles missing autopilot rules")
+
+    setup_test $app setup $odir
+
+    NOSHELL=""
+    [ "$app" = "unity8" ] && NOSHELL="-n"
+    EXTRA=""
         # Use --timeout-profile=long only if we are using the emulator
-	[ -z $USE_EMULATOR ] || EXTRA="-A '--timeout-profile=long'"
-
-	phablet-test-run \
-		$NOSHELL $EXTRA \
-		-o ${odir} -f subunit \
-		-a /var/crash -a /home/phablet/.cache/upstart \
-		-a /var/log/syslog \
-		-A --timeout-profile=long \
-		-v $app || true
-	adb shell rm -rf /tmp/ci-logs
-	adb shell mkdir /tmp/ci-logs
-	adb shell sudo install -o phablet \
-		-m 666 /var/log/upstart/whoopsie.log /tmp/ci-logs
-	adb-shell "sudo system-image-cli --info > /tmp/ci-logs/system-image-cli.log"
-	adb-shell "dpkg -l > /tmp/ci-logs/dpkg-l.log"
-	adb pull /tmp/ci-logs ${odir}
-
-	system_settle after $odir
-	setup_test $app teardown $odir
-	if [ -f ${odir}/test_results.subunit ] ; then
-		cat ${odir}/test_results.subunit | subunit2junitxml > ${odir}/test_results.xml
-	fi
-	${BASEDIR}/scripts/combine_results ${odir}
+    [ -z $USE_EMULATOR ] || EXTRA="-A '--timeout-profile=long'"
+
+    phablet-test-run \
+        $NOSHELL $EXTRA \
+        -o ${odir} -f subunit \
+        -a /var/crash -a /home/phablet/.cache/upstart \
+        -a /var/log/syslog \
+        -A --timeout-profile=long \
+        -v $app || true
+    adb shell rm -rf /tmp/ci-logs
+    adb shell mkdir /tmp/ci-logs
+    adb shell sudo install -o phablet \
+        -m 666 /var/log/upstart/whoopsie.log /tmp/ci-logs
+    adb-shell "sudo system-image-cli --info > /tmp/ci-logs/system-image-cli.log"
+    adb-shell "dpkg -l > /tmp/ci-logs/dpkg-l.log"
+    adb pull /tmp/ci-logs ${odir}
+
+    system_settle after $odir
+    setup_test $app teardown $odir
+    if [ -f ${odir}/test_results.subunit ] ; then
+        cat ${odir}/test_results.subunit | subunit2junitxml > ${odir}/test_results.xml
+    fi
+    ${BASEDIR}/scripts/combine_results ${odir}
 }
 
 reboot_wait() {
-	if [ -z $QUICK ] ; then
-		if ! reboot-and-unlock.sh; then
+    if [ -z $QUICK ] ; then
+        if ! reboot-and-unlock.sh; then
                     log_error "Failed to unlock screen, retrying..."
                     reboot-and-unlock.sh || log_error "Screen unlock still fails, continuing anyway"
                 fi
-		FILES="/var/crash/* /home/phablet/.cache/upstart/*.log*"
-		if ! adb shell "sudo rm -rf $FILES" ; then
-			log_error "unable to remove crash and log files, retrying"
-			adb wait-for-device
-			adb shell "sudo rm -rf $FILES"
-		fi
-	else
-		echo "SKIPPING phone reboot..."
-	fi
+        FILES="/var/crash/* /home/phablet/.cache/upstart/*.log*"
+        if ! adb shell "sudo rm -rf $FILES" ; then
+            log_error "unable to remove crash and log files, retrying"
+            adb wait-for-device
+            adb shell "sudo rm -rf $FILES"
+        fi
+    else
+        echo "SKIPPING phone reboot..."
+    fi
 }
 
 if [ -z $USE_EMULATOR ] ; then
 grab_powerd() {
-	echo "grabbing powerd cli locks..."
-	adb shell sudo powerd-cli active &
-	PIDS="$!"
-	adb shell sudo powerd-cli display on &
-	PIDS="$PIDS $!"
+    echo "grabbing powerd cli locks..."
+    adb shell sudo powerd-cli active &
+    PIDS="$!"
+    adb shell sudo powerd-cli display on &
+    PIDS="$PIDS $!"
 }
 
 release_powerd() {
-	if [ -n "$PIDS" ] ; then
-		echo "killing child pids: $PIDS"
-		for p in $PIDS ; do
-			kill $p || true
-		done
-		PIDS=""
-	fi
+    if [ -n "$PIDS" ] ; then
+        echo "killing child pids: $PIDS"
+        for p in $PIDS ; do
+            kill $p || true
+        done
+        PIDS=""
+    fi
         adb shell sudo pkill powerd-cli
 }
 
 else
 grab_powerd() {
-	#emulator does not use powerd, so this is noop
-	return 0
+    #emulator does not use powerd, so this is noop
+    return 0
 }
 
 release_powerd() {
-	#emulator does not use powerd, so this is noop
-	return 0
+    #emulator does not use powerd, so this is noop
+    return 0
 }
 fi
 
 dashboard_update() {
-	# only try and update the dashboard if we are configured to
-	[ -z $DASHBOARD_KEY ] && return 0
-	[ -z $DASHBOARD_BUILD ] && return 0
-	[ -z $DASHBOARD_IMAGE ] && return 0
-	${BASEDIR}/scripts/dashboard.py $* \
-		--image $DASHBOARD_IMAGE \
-		--build $DASHBOARD_BUILD || true
+    # only try and update the dashboard if we are configured to
+    [ -z $DASHBOARD_KEY ] && return 0
+    [ -z $DASHBOARD_BUILD ] && return 0
+    [ -z $DASHBOARD_IMAGE ] && return 0
+    ${BASEDIR}/scripts/dashboard.py $* \
+        --image $DASHBOARD_IMAGE \
+        --build $DASHBOARD_BUILD || true
 }
 
 dashboard_result_running() {
-	dashboard_update result-running --test $1
+    dashboard_update result-running --test $1
 }
 
 dashboard_result_syncing() {
-	xunit=${RESDIR}/${app}/test_results.xml
-	[ -f $xunit ] || return 0
+    xunit=${RESDIR}/${app}/test_results.xml
+    [ -f $xunit ] || return 0
 
-	# save a utah.yaml version of the results so the dashboard can process
-	cat $xunit | ${BASEDIR}/scripts/junit2utah.py > ${RESDIR}/${app}/utah.yaml
-	dashboard_update result-syncing --test $1 --results ${RESDIR}/${app}/utah.yaml
+    # save a utah.yaml version of the results so the dashboard can process
+    cat $xunit | ${BASEDIR}/scripts/junit2utah.py > ${RESDIR}/${app}/utah.yaml
+    dashboard_update result-syncing --test $1 --results ${RESDIR}/${app}/utah.yaml
 }
 
 main() {
-	[ -d $RESDIR ] || mkdir -p $RESDIR
-
-	set -x
-
-	for app in $APPS ; do
-		set +x
-		echo "========================================================"
-		echo "= testing $app"
-		echo "========================================================"
-		set -x
-		dashboard_result_running $app
-		reboot_wait
-
-		grab_powerd
-
-		if ! test_app $app ; then
-			log_error "testing $app, retrying"
-			# we sometimes see sporatic adb failures that seem to
-			# related to MTP. This adds a retry for the test.
-			# test_app only fails on a device error (not a test
-			# case error)
-			adb wait-for-device
-			test_app $app
-		fi
-		dashboard_result_syncing $app
-
-		release_powerd
-	done
+    [ -d $RESDIR ] || mkdir -p $RESDIR
+
+    set -x
+
+    for app in $APPS ; do
+        set +x
+        echo "========================================================"
+        echo "= testing $app"
+        echo "========================================================"
+        set -x
+        dashboard_result_running $app
+        reboot_wait
+
+        grab_powerd
+
+        if ! test_app $app ; then
+            log_error "testing $app, retrying"
+            # we sometimes see sporatic adb failures that seem to
+            # related to MTP. This adds a retry for the test.
+            # test_app only fails on a device error (not a test
+            # case error)
+            adb wait-for-device
+            test_app $app
+        fi
+        dashboard_result_syncing $app
+
+        release_powerd
+    done
 }
 
 while getopts s:a:o:QSh opt; do
-	case $opt in
-	h)
-		usage
-		exit 0
-		;;
-	s)
-		export ANDROID_SERIAL=$OPTARG
-		;;
-	o)
-		RESDIR=$OPTARG
-		;;
-	a)
-		APPS="$APPS $OPTARG"
-		;;
-	Q)
-		QUICK=1
-		;;
-	S)
-		NOSETTLE=1
-		;;
-	esac
+    case $opt in
+    h)
+        usage
+        exit 0
+        ;;
+    s)
+        export ANDROID_SERIAL=$OPTARG
+        ;;
+    o)
+        RESDIR=$OPTARG
+        ;;
+    a)
+        APPS="$APPS $OPTARG"
+        ;;
+    Q)
+        QUICK=1
+        ;;
+    S)
+        NOSETTLE=1
+        ;;
+    esac
 done
 
 if [ -z $ANDROID_SERIAL ] ; then
-	# ensure we only have one device attached
-	lines=$(adb devices | wc -l)
-	if [ $lines -gt 3 ] ; then
-		echo "ERROR: More than one device attached, please use -s option"
-		echo
-		usage
-		exit 1
-	fi
+    # ensure we only have one device attached
+    lines=$(adb devices | wc -l)
+    if [ $lines -gt 3 ] ; then
+        echo "ERROR: More than one device attached, please use -s option"
+        echo
+        usage
+        exit 1
+    fi
 fi
 if [ -z "$APPS" ] ; then
-	echo "ERROR: No app specified"
-	usage
-	exit 1
+    echo "ERROR: No app specified"
+    usage
+    exit 1
 fi
 
 trap release_powerd TERM INT EXIT
 if [ -n "$USE_EMULATOR" ] ; then
-	echo "disabling system-settle testing for emulator"
-	NOSETTLE=1
+    echo "disabling system-settle testing for emulator"
+    NOSETTLE=1
 fi
 main

=== modified file 'scripts/run-mp.sh'
--- scripts/run-mp.sh	2014-11-11 18:32:07 +0000
+++ scripts/run-mp.sh	2015-06-03 20:47:10 +0000
@@ -3,10 +3,10 @@
 
 # These are all set via jenkins when running in that context
 if [ -z "${ANDROID_SERIAL}" ] || [ -z "${package_archive}" ] || \
-	[ -z "${test_packages}" ] || [ -z "${test_suite}" ]; then
-	echo "Missing an env variable: "
-	echo "    ANDROID_SERIAL, package_archive, test_packages or test_suite"
-	exit 1
+    [ -z "${test_packages}" ] || [ -z "${test_suite}" ]; then
+    echo "Missing an env variable: "
+    echo "    ANDROID_SERIAL, package_archive, test_packages or test_suite"
+    exit 1
 fi
 
 BASEDIR=$(dirname $(readlink -f $0))/..
@@ -22,13 +22,13 @@
 # configuration files when executed by jenkins.
 package_list=""
 for package in ${test_packages}; do
-	package_list="-p ${package} ${package_list}"
+    package_list="-p ${package} ${package_list}"
 done
 
 # This is a list of test suites to execute. It's normally just one.
 suite_list=""
 for suite in ${test_suite}; do
-	suite_list="-a ${suite} ${suite_list}"
+    suite_list="-a ${suite} ${suite_list}"
 done
 
 # The provision.sh and run-smoke scripts can install extra packages to meet
@@ -39,6 +39,6 @@
 
 # Provision the device and run the test suite.
 ${BASEDIR}/scripts/provision.sh -s ${ANDROID_SERIAL} \
-	-n ${HOME}/.ubuntu-ci/wifi.conf \
-	-D ${package_dir} ${package_list}
+    -n ${HOME}/.ubuntu-ci/wifi.conf \
+    -D ${package_dir} ${package_list}
 ${BASEDIR}/scripts/run-smoke -s ${ANDROID_SERIAL} -n ${suite_list}

=== modified file 'scripts/run-touch-upgrade.sh'
--- scripts/run-touch-upgrade.sh	2013-08-30 20:28:05 +0000
+++ scripts/run-touch-upgrade.sh	2015-06-03 20:47:10 +0000
@@ -26,9 +26,9 @@
 
 set +e
 sudo NETWORK_FILE=$NETWORK_FILE \
-	$UTAH_PHABLET_CMD -s $ANDROID_SERIAL \
-	--from-host --skip-install --skip-utah --skip-network  -l $RUNLIST \
-	--results-dir=$RESDIR
+    $UTAH_PHABLET_CMD -s $ANDROID_SERIAL \
+    --from-host --skip-install --skip-utah --skip-network  -l $RUNLIST \
+    --results-dir=$RESDIR
 EXITCODE=$?
 
 UTAHFILE=$RESDIR/utah.yaml