Merge lp:~saviq/unity/8.flipped-support into lp:unity/8.0

[Michał Sawicz]

Support flipped image in run_on_device.

Flipped images are coming!

They're coming right for us!

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:41
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/180/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/326
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/178
        deb: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/178/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/179
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/167
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/328
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/328/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/299

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/180/rebuild

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

Tested with old-style and with flipped image. Both, ./run_on_device -s and ./run_on_device work. Same for the adb-over-tcp check.

review: Approve

=== modified file 'run_on_device'
--- run_on_device	2013-06-12 08:46:06 +0000
+++ run_on_device	2013-06-24 11:12:28 +0000
@@ -15,6 +15,8 @@
 KEYLOCK=false
 SUDO="echo $PASSWORD | sudo -S"
 NUM_JOBS='$(( `grep -c ^processor /proc/cpuinfo` + 1 ))'
+FLIPPED=false
+CHROOT_PREFIX="/data/ubuntu"
 
 usage() {
     echo "usage: run_on_device [OPTIONS]\n"
@@ -35,7 +37,11 @@
 }
 
 exec_with_adb() {
-    adb shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin "$@"
+    if $FLIPPED; then
+        adb shell $@
+    else
+        adb shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin "$@"
+    fi
 }
 
 adb_root() {
@@ -45,7 +51,7 @@
 
 install_ssh_key() {
     ssh-keygen -R $TARGET_IP
-    HOME_DIR=/data/ubuntu/home/phablet
+    HOME_DIR="${CHROOT_PREFIX}/home/phablet"
     adb push ~/.ssh/id_rsa.pub $HOME_DIR/.ssh/authorized_keys
     adb shell chown $USER_ID:$USER_ID $HOME_DIR/.ssh
     adb shell chown $USER_ID:$USER_ID $HOME_DIR/.ssh/authorized_keys
@@ -79,14 +85,15 @@
 }
 
 run() {
-    SERVICEFILE="/data/ubuntu/etc/device-services"
+    SERVICEFILE="${CHROOT_PREFIX}/etc/device-services"
     adb shell "egrep '$BINARY|qml-phone-shell' $SERVICEFILE"
     CONTAINS_SHELL=$?
     if [ $CONTAINS_SHELL -eq 0 ]; then
         echo "Modifying $SERVICEFILE on device. Old contents will be saved in $SERVICEFILE.backup"
         adb shell cp $SERVICEFILE $SERVICEFILE.backup
         adb shell sed -i "/$BINARY\\\\\|qml-phone-shell/d" $SERVICEFILE
-        adb shell "chroot /data/ubuntu /usr/bin/service ubuntu-session restart"
+        if $FLIPPED; then exec_with_adb /usr/bin/service ubuntu-touch-session restart
+        else exec_with_adb /usr/bin/service ubuntu-session restart; fi
     fi
     adb shell pkill qml-phone-shell
     adb shell pkill $BINARY
@@ -106,7 +113,8 @@
     if [ $CONTAINS_SHELL -eq 0 ]; then
         echo "Restoring $SERVICEFILE on device from $SERVICEFILE.backup"
         adb shell cp $SERVICEFILE.backup $SERVICEFILE
-        adb shell "chroot /data/ubuntu /usr/bin/service ubuntu-session restart"
+        if $FLIPPED; then exec_with_adb /usr/bin/service ubuntu-touch-session restart
+        else exec_with_adb /usr/bin/service ubuntu-session restart; fi
     fi
 }
 
@@ -130,6 +138,16 @@
 adb_root
 [ "${TARGET_IP}" = "127.0.0.1" ] && setup_adb_forwarding
 
+if [ "`adb shell 'grep -q Ubuntu /etc/lsb-release 2> /dev/null && echo -n FLIPPED'`" = "FLIPPED" ]; then
+    FLIPPED=true
+    CHROOT_PREFIX=""
+    if [ "${TARGET_IP}" != "127.0.0.1" ]; then
+        echo "ERROR: Flipped image detected, adb over TCP/IP isn't supported, yet :/"
+        echo "Unset TARGET_IP and try again."
+        exit 2
+    fi
+fi
+
 if $SETUP; then
     echo "Setting up environment for building shell.."
     install_ssh_key