Merge lp:~paulliu/unity8/fix_run_on_devices_script_20140930 into lp:unity8

[Ying-Chun Liu]

Fix run_on_device.sh to let it run again.

 * Are there any related MPs required for this MP to build/function as expected? Please list.
None.
 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes.
 * Did you make sure that your branch does not contain spurious tags?
Yes.
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A.
 * If you changed the UI, has there been a design review?
N/A

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1302
http://jenkins.qa.ubuntu.com/job/unity8-ci/4462/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5378
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1458
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1556
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1556
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5091
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6630
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6630/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14008

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4462/rebuild

review: Needs Fixing (continuous-integration)

[Michael Terry (mterry)]

I think this needs an additional fix. You'll notice that if you run it now, the rm call at the end can't find the file. And if you try to print the PASSFILE var, you get weird output.

Apparently 'adb shell' is including a return character (\r) as if it were in DOS. An easy fix is to make the line look like:

PASSFILE=$(adb shell 'mktemp' | tr -d '\r')

review: Needs Fixing

[lp:~paulliu/unity8/fix_run_on_devices_script_20140930]

1303. By Ying-Chun Liu on 2014-10-08

fix trailing \r

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1303
http://jenkins.qa.ubuntu.com/job/unity8-ci/4536/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5653/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1521/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1632
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1630
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6905/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4536/rebuild

review: Needs Fixing (continuous-integration)

[Michael Terry (mterry)]

Looks good now!

review: Approve

[Michael Terry (mterry)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
 Yes

 * Did CI run pass? If not, please explain why.
 No, for unrelated reasons

 * Did you make sure that the branch does not contain spurious tags?
 Yes

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1303
http://jenkins.qa.ubuntu.com/job/unity8-ci/4571/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5735
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1557
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1667
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1665
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5395
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6987
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6987/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14400

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4571/rebuild

review: Needs Fixing (continuous-integration)

[lp:~paulliu/unity8/fix_run_on_devices_script_20140930]

1304. By Ying-Chun Liu on 2014-10-09

merge trunk

[Michał Sawicz (saviq)]

This got merged, bar the last "merge" commit.

=== modified file 'run_on_device.sh'
--- run_on_device.sh	2014-09-10 11:31:51 +0000
+++ run_on_device.sh	2014-10-09 14:40:27 +0000
@@ -130,11 +130,10 @@
     usage
 fi
 
-PASSFILE=$( adb shell "FILE=\`mktemp\`
-                       echo \"#!/bin/sh\" > \$FILE
-                       echo \"echo \\\"${PASSWORD}\\\"\" >> \$FILE
-                       chmod +x \$FILE
-                       echo \$FILE" | tr -d '\r' )
+PASSFILE=$(adb shell 'mktemp' | tr -d '\r')
+adb shell "echo '#!/bin/sh' > ${PASSFILE}"
+adb shell "echo \"echo \\\"${PASSWORD}\\\"\" >> ${PASSFILE}"
+adb shell "chmod +x ${PASSFILE}"
 
 setup_adb_forwarding