Merge lp:~sergiusens/phablet-tools/click-buddy into lp:phablet-tools

[Sergio Schvezov]

Tool to make it easier to build and test clicks

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~sergiusens/phablet-tools/click-buddy]

234. By Sergio Schvezov on 2014-01-18

Adding no-clean option and CMAKE_PARAMS

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Worked for me!

[Ricardo Salveti (rsalveti)]

129 + adb $ADBOPTS shell mkdir -p /home/phablet/autopilot
130 + adb $ADBOPTS push $SOURCE/tests/autopilot /home/phablet/autopilot
131 + adb $ADBOPTS shell chown -R "$DEVICE_USER":"$DEVICE_USER" /home/phablet/autopilot

You have the username in a var already, use it to build the home dir path.

review: Needs Fixing

[lp:~sergiusens/phablet-tools/click-buddy]

235. By Sergio Schvezov on 2014-01-20

Removing phablet and using DEVICE_USER

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~sergiusens/phablet-tools/click-buddy]

236. By Sergio Schvezov on 2014-01-20

Adding click dep

[Ricardo Salveti (rsalveti)]

Good, tested, worked as expected.

Thanks.

review: Approve

=== added file 'click-buddy'
--- click-buddy	1970-01-01 00:00:00 +0000
+++ click-buddy	2014-01-20 19:19:19 +0000
@@ -0,0 +1,138 @@
+#!/bin/sh
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the the GNU General Public License version 3, as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the applicable version of the GNU General Public
+# License for more details.
+#.
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Copyright (C) 2014 Canonical, Ltd.
+#
+# Author: Sergio Schvezov <[e-mail]>
+
+export LC_ALL=C
+
+usage() {
+cat <<EOF
+usage: $0 [OPTIONS]
+
+Creates and runs click apps
+
+OPTIONS:
+  -h	Show this message
+  -s    Specify the serial of the device to install (see adb $ADBOPTS devices)
+
+  --bzr-source 	bzr sources used to backreference the package
+  --dir      	directory holding the package to build
+  --provision   Install resulting click and run tests
+  --no-clean    Don't clean temporary directories
+EOF
+}
+
+ADBOPTS=""
+PROVISION=""
+SOURCE=""
+BZR_SOURCE=""
+NO_CLEAN=""
+
+TEST_DIR='tests/autopilot'
+DEVICE_USER='phablet'
+
+ARGS=$(getopt -o s:h -l "bzr-source:,provision,no-clean,dir:,help" -n "$0" -- "$@")
+
+if [ $? -ne 0 ] ; then
+    exit 1
+fi
+eval set -- "$ARGS"
+
+while true; do
+    case "$1" in
+        -h|--help)
+            usage
+            exit 0
+            ;;
+        -s)
+            shift;
+            ADBOPTS="-s $1"
+            shift;
+            ;;
+        --provision)
+            shift;
+            PROVISION=1
+            ;;
+        --bzr-source)
+            shift
+            BZR_SOURCE="$1"
+            shift
+            ;;
+        --dir)
+            shift
+            SOURCE="$(readlink -f $1)"
+            shift
+            ;;
+        --no-clean)
+            shift
+            NO_CLEAN=1
+            ;;
+        --)
+            shift;
+            break;
+            ;;
+    esac
+done
+
+builddir=$(mktemp -d)
+installdir=$(mktemp -d)
+if [ -z "$NO_CLEAN" ]; then
+    trap 'rm -rf "$builddir" "$installdir"' EXIT
+fi
+
+if [ ! -f $SOURCE/CMakeLists.txt ]; then
+    echo "$SOURCE not a valid source dir"
+    usage
+    exit 1
+fi
+
+workdir=$(pwd)
+cd $builddir
+
+CMAKE_PARAMS="-DINSTALL_TESTS=off -DCLICK_MODE=on \
+	-DBZR_REVNO=$(cd $SOURCE; bzr revno)"
+
+if [ -n "$BZR_SOURCE" ]; then
+	CMAKE_PARAMS="$CMAKE_PARAMS -DBZR_SOURCE=$BZR_SOURCE"
+fi
+
+cmake "$SOURCE" $CMAKE_PARAMS
+
+make DESTDIR=$installdir install
+click build $installdir
+cp *.click $workdir
+
+if [ -n "$PROVISION" ]; then
+    set -e
+    for click in *.click; do
+        adb $ADBOPTS push "$click" /tmp
+        adb $ADBOPTS shell sudo -u $DEVICE_USER bash -ic "pkcon install-local /tmp/$click"
+    done
+
+    adb $ADBOPTS shell mkdir -p /home/$DEVICE_USER/autopilot
+    adb $ADBOPTS push $SOURCE/tests/autopilot /home/$DEVICE_USER/autopilot
+    adb $ADBOPTS shell chown -R "$DEVICE_USER":"$DEVICE_USER" /home/$DEVICE_USER/autopilot
+    set +e
+
+    echo Allowing autopilot to play well with apparmor
+    phablet-config autopilot --dbus-probe enable
+    echo "Ready to run autopilot"
+fi
+
+if [ -n "$NO_CLEAN" ]; then
+    echo build dir was $builddir
+    echo install dir was $installdir
+fi

=== modified file 'debian/control'
--- debian/control	2013-12-12 23:45:16 +0000
+++ debian/control	2014-01-20 19:19:19 +0000
@@ -29,6 +29,7 @@
  android-tools-adb (>= 4.2.2),
  android-tools-fastboot (>= 4.2.2),
  bzr,
+ click,
  curl,
  dpkg-dev,
  python-configobj,

=== modified file 'setup.py'
--- setup.py	2013-11-09 11:04:28 +0000
+++ setup.py	2014-01-20 19:19:19 +0000
@@ -16,6 +16,7 @@
     'phablet-network',
     'phablet-screenshot',
     'phablet-test-run',
+    'click-buddy',
     ]
 
 if __name__ == "__main__":