Merge lp:~sergiusens/phablet-tools/1270497 into lp:phablet-tools

[Sergio Schvezov]

Removing device serial detection and using the same mechanism as in other tools.
Removing the unnecessary call to adb root.

[lp:~sergiusens/phablet-tools/1270497]

234. By Sergio Schvezov on 2014-01-20

Removing logic to detect the default adb device and the unnecessary call to adb root

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:234
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/265/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-amd64-ci/37
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-armhf-ci/37
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-i386-ci/37

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-tools-ci/265/rebuild

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

Good, thanks!

review: Approve

=== modified file 'phablet-test-run'
--- phablet-test-run	2013-11-12 21:28:35 +0000
+++ phablet-test-run	2014-01-20 20:00:23 +0000
@@ -22,6 +22,7 @@
 
 EXECUTE_COMMAND=0
 USER=phablet
+ADBOPTS=""
 NOSHELL=0
 RETVAL=0
 VERBOSE=""
@@ -44,20 +45,15 @@
 }
 
 wait_for_device() {
-    adb -s $ANDROID_SERIAL wait-for-device
+    adb $ADBOPTS wait-for-device
 }
 
 exec_with_adb() {
-    adb -s $ANDROID_SERIAL shell /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin "$@"
+    adb $ADBOPTS shell /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin "$@"
 }
 
 exec_with_adb_user() {
-    adb -s $ANDROID_SERIAL shell sudo -u $USER -i sh -lc \'"$@"\'
-}
-
-adb_root() {
-    adb root
-    adb wait-for-device
+    adb $ADBOPTS shell sudo -u $USER -i sh -lc \'"$@"\'
 }
 
 install_packages() {
@@ -172,7 +168,7 @@
         TESTPACKAGES="$TESTPACKAGES $OPTARG"
         ;;
     s)
-        ANDROID_SERIAL=$OPTARG
+        ADBOPTS="-s $OPTARG"
         ;;
     x)
         EXECUTE_COMMAND=1
@@ -191,14 +187,6 @@
     exit 0
 fi
 
-if test -z $ANDROID_SERIAL; then
-    ANDROID_SERIAL=$(adb devices -l | grep usb | cut -f 1 -d " " | head -n1)
-fi
-export ANDROID_SERIAL=$ANDROID_SERIAL
-
-adb_root
-
-
 install_packages
 
 if [ $NOSHELL -eq 1 ]; then