Mir

Merge lp:~vanvugt/mir/fix-1206369 into lp:~mir-team/mir/trunk

Proposed by Daniel van Vugt on 2013-07-30
Status: Merged
Approved by: Alan Griffiths on 2013-07-30
Approved revision: 891
Merged at revision: 894
Proposed branch: lp:~vanvugt/mir/fix-1206369
Merge into: lp:~mir-team/mir/trunk
Diff against target: 21 lines (+1/-3)
1 file modified
tools/install_on_android.sh (+1/-3)
To merge this branch: bzr merge lp:~vanvugt/mir/fix-1206369
Reviewer Review Type Date Requested Status
Alan Griffiths Approve on 2013-07-30
Alexandros Frantzis (community) 2013-07-30 Approve on 2013-07-30
PS Jenkins bot (community) continuous-integration Approve on 2013-07-30
Review via email: mp+177513@code.launchpad.net

Commit message

Don't run Android commands which are no longer valid in flipped phablet
images. They will only kill your connection to the device. (LP: #1206369)

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tools/install_on_android.sh'
2--- tools/install_on_android.sh 2013-04-24 05:22:20 +0000
3+++ tools/install_on_android.sh 2013-07-30 07:11:27 +0000
4@@ -26,7 +26,6 @@
5 adb wait-for-device
6 adb root
7 adb wait-for-device
8- adb shell stop
9 adb shell mkdir -p ${RUN_DIR}
10
11 for x in bin/acceptance-tests \
12@@ -39,8 +38,7 @@
13 adb push $x ${RUN_DIR}
14 done
15
16- echo "ubuntu_chroot shell;
17- cd ${RUN_DIR};
18+ echo "cd ${RUN_DIR};
19 export GTEST_OUTPUT=xml:./;
20 export LD_LIBRARY_PATH=.;
21 ./unit-tests;

Subscribers

People subscribed via source and target branches