Merge lp:~saviq/unity/phablet.fix-run_on_device into lp:unity/phablet

[Michał Sawicz]

use the ./build and ./run scripts on the device

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:578
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/448/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/212
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/449
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/449/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/448
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/324
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/324/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/328
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/906

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

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

Works

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:579
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/450/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/214
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/451
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/451/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/450
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/326
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/326/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/330
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/909

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

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-04 22:55:13 +0000
+++ debian/changelog	2013-04-11 12:55:24 +0000
@@ -1,3 +1,33 @@
+qml-phone-shell (1.70) quantal; urgency=low
+
+  * CMake fixes
+  * improve HUD PeakDetector performance
+  * initial QML coverage measurement
+  * enable coverage analysis for C/C++
+  * require out-of-source builds
+  * fix incorrect linkage in hudclient.cpp
+  * reduce warnings
+  * add an optional on-commit test hook
+  * tests for:
+    * IndicatorRow
+    * Tile
+    * SearchIndicator
+    * trailing whitespace
+    * PageHeader
+    * SearchHistoryModel
+    * ResponsiveFlowView
+    * SideStage
+    * Indicators
+  * move tests into subdirectories
+  * increase test setup consistency
+  * remove some dead code
+  * register CategoryFilter to QML
+  * use a static python install path for autopilot
+  * merge first stages of libunity-api
+  * drop unneeded moc includes
+
+ -- Michał Sawicz <[e-mail]>  Thu, 11 Apr 2013 14:42:22 +0200
+
 qml-phone-shell (1.69) quantal; urgency=low
 
   [ Sergio Schvezov ]

=== modified file 'run'
--- run	2013-04-05 14:39:17 +0000
+++ run	2013-04-11 12:55:24 +0000
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 UNITY_CORE_BUILD_DIR=$PWD/../unity_build/build
-LD_LIBRARY_PATH=$UNITY_CORE_BUILD_DIR/lib ./builddir/qml-phone-shell
+LD_LIBRARY_PATH=$UNITY_CORE_BUILD_DIR/lib ./builddir/qml-phone-shell $@

=== modified file 'run_on_device'
--- run_on_device	2013-03-21 21:39:31 +0000
+++ run_on_device	2013-04-11 12:55:24 +0000
@@ -69,8 +69,7 @@
 }
 
 build() {
-    exec_with_ssh "cd $CODE_DIR/ && PATH=/usr/lib/ccache:$PATH cmake -DCMAKE_BUILD_TYPE=Debug ."
-    exec_with_ssh PATH=/usr/lib/ccache:$PATH "make -j${NUM_JOBS}" --directory=$CODE_DIR/
+    exec_with_ssh PATH=/usr/lib/ccache:$PATH "cd $CODE_DIR/ && PATH=/usr/lib/ccache:$PATH ./build"
 }
 
 run() {
@@ -88,7 +87,7 @@
         adb shell "chroot /data/ubuntu /usr/bin/service ubuntu-session restart"
     fi
     adb shell pkill $BINARY
-    exec_with_ssh "cd $CODE_DIR/ && ./$BINARY $RUN_OPTIONS"
+    exec_with_ssh "cd $CODE_DIR/ && ./run $RUN_OPTIONS"
     if [ $CONTAINS_SHELL -eq 0 ]; then
         echo "Restoring $SERVICEFILE on device from $SERVICEFILE.backup"
         adb shell cp $SERVICEFILE.backup $SERVICEFILE