1
=== modified file 'phablet-test-run'
2
--- phablet-test-run	2014-01-20 19:59:53 +0000
3
+++ phablet-test-run	2014-02-05 22:09:22 +0000
4
@@ -19,6 +19,8 @@
5
19
LOCALPACKAGES=""
19
LOCALPACKAGES=""
6
20
RESULTDIR=""
20
RESULTDIR=""
7
21
ARTIFACTS=""
21
ARTIFACTS=""
8
22
TESTS_LOCATION=""
9
23
REMOTE_TESTBASE="/tmp/autopilot_tests"
10
22
24
11
23
EXECUTE_COMMAND=0
25
EXECUTE_COMMAND=0
12
24
USER=phablet
26
USER=phablet
13
@@ -29,7 +31,7 @@
14
29
31
15
30
print_usage() {
32
print_usage() {
16
31
    cat << EOF
33
    cat << EOF
18
32
usage: $0 [-s SERIAL] [-s] [-n] [-x] [-v] [-p PACKAGENAME] [-c PACKAGE] [-o DIR] [-a ARTIFACT] testsuite
34
usage: $0 [-s SERIAL] [-s] [-n] [-x] [-v] [-p PACKAGENAME] [-c PACKAGE] [-o DIR] [-a ARTIFACT] [-t LOCATION] testsuite
19
33
35
20
34
  Run the specified testsuite on the device
36
  Run the specified testsuite on the device
21
35
37
22
@@ -40,6 +42,8 @@
23
40
  -o DIR           Test report and artifacts output dir
42
  -o DIR           Test report and artifacts output dir
24
41
  -a ARTIFACT      Artifact to fetch after the test, may be used multiple times (requires -o)
43
  -a ARTIFACT      Artifact to fetch after the test, may be used multiple times (requires -o)
25
42
  -x               Execute command line, will not use autopilot by default
44
  -x               Execute command line, will not use autopilot by default
26
45
  -t LOCATION      Test location. It can be a local directory or an uri to a
27
46
                   bzr location
28
43
  -v               Run autopilot with -v option for more verbose output
47
  -v               Run autopilot with -v option for more verbose output
29
44
EOF
48
EOF
30
45
}
49
}
31
@@ -103,7 +107,11 @@
32
103
    # adb shell always returns 0, so we have to do some hackery to get the
107
    # adb shell always returns 0, so we have to do some hackery to get the
33
104
    # actual RC from the test
108
    # actual RC from the test
34
105
    {
109
    {
36
106
        apbase="sudo -iu $USER bash -ic \"cd /home/phablet/autopilot; autopilot run $VERBOSE"
110
        wdir=/home/$USER/autopilot
37
111
        if [ -n "$TESTS_LOCATION" ]; then
38
112
            wdir=${REMOTE_TESTBASE}
39
113
        fi
40
114
        apbase="sudo -iu $USER bash -ic \"mkdir -p $wdir; cd $wdir; autopilot run $VERBOSE"
41
107
        if [ "$RESULTDIR" ]; then
115
        if [ "$RESULTDIR" ]; then
42
108
            adb shell "$apbase -o /tmp/test_results.xml -f xml $TESTSUITE\"; echo ADB_RC=\$?"
116
            adb shell "$apbase -o /tmp/test_results.xml -f xml $TESTSUITE\"; echo ADB_RC=\$?"
43
109
            echo "***** Test summary *****"
117
            echo "***** Test summary *****"
44
@@ -146,7 +154,35 @@
45
146
    fi
154
    fi
46
147
}
155
}
47
148
156
49
149
while getopts a:c:hnxo:p:s:v opt; do
157
pull_tests() {
50
158
    # Pull test from a local directory or launchpad branch to the device
51
159
    #
52
160
    # $1: Tests URI either path to a local autopilot tests directory or lp
53
161
    #     branch
54
162
    testdir=$(mktemp -d /tmp/$(basename $0).XXXXXX)
55
163
    location=""
56
164
57
165
    if [ "$( echo $1 | cut -c-3)" = "lp:" ]; then
58
166
        echo "Branching tests from $1"
59
167
        ( cd $testdir; bzr  export $(basename $1) $1 )
60
168
        location=${testdir}/$(basename $1)
61
169
    elif [ -d "$1" ]; then
62
170
        echo "Using tests from local directory: $1"
63
171
        location=$1
64
172
    else
65
173
        echo "Invalid test directory: $location"
66
174
        exit 1
67
175
    fi
68
176
69
177
    remotedir=${REMOTE_TESTBASE}/$(basename $location)
70
178
    if [ -d "$location" ]; then
71
179
        exec_with_adb rm -Rf $REMOTE_TESTBASE
72
180
        exec_with_adb mkdir -p $remotedir
73
181
        adb push $location $remotedir
74
182
    fi
75
183
    rm -Rf $testdir
76
184
}
77
185
while getopts a:c:hnxo:p:s:t:v opt; do
78
150
    case $opt in
186
    case $opt in
79
151
    a)
187
    a)
80
152
        ARTIFACTS="$ARTIFACTS $OPTARG"
188
        ARTIFACTS="$ARTIFACTS $OPTARG"
81
@@ -170,6 +206,9 @@
82
170
    s)
206
    s)
83
171
        ADBOPTS="-s $OPTARG"
207
        ADBOPTS="-s $OPTARG"
84
172
        ;;
208
        ;;
85
209
    t)
86
210
        TESTS_LOCATION="$OPTARG"
87
211
        ;;
88
173
    x)
212
    x)
89
174
        EXECUTE_COMMAND=1
213
        EXECUTE_COMMAND=1
90
175
        ;;
214
        ;;
91
@@ -189,6 +228,10 @@
92
189
228
93
190
install_packages
229
install_packages
94
191
230
95
231
if [ ! -z "$TESTS_LOCATION" ]; then
96
232
    pull_tests $TESTS_LOCATION
97
233
fi
98
234
99
192
if [ $NOSHELL -eq 1 ]; then
235
if [ $NOSHELL -eq 1 ]; then
100
193
    echo "Disabling shell"
236
    echo "Disabling shell"
101
194
    disable_shell
237
    disable_shell
Status:	Needs review
Proposed branch:	lp:~jibel/phablet-tools/run_tests_from_custom_location
Merge into:	lp:phablet-tools
Diff against target:	101 lines (+46/-3) 1 file modified phablet-test-run (+46/-3)
To merge this branch:	bzr merge lp:~jibel/phablet-tools/run_tests_from_custom_location
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2014-02-05
Nicholas Skaggs		2014-02-05	Pending
Ubuntu Phablet Team		2014-02-05	Pending
Review via email: mp+205033@code.launchpad.net