Merge lp:~ken-vandine/cupstream2distro-config/autopilot-touch into lp:cupstream2distro-config

Proposed by Ken VanDine
Status: Merged
Approved by: Łukasz Zemczak
Approved revision: 293
Merged at revision: 292
Proposed branch: lp:~ken-vandine/cupstream2distro-config/autopilot-touch
Merge into: lp:cupstream2distro-config
Diff against target: 51 lines (+4/-4)
4 files modified
stacks/head/apps.cfg (+1/-1)
stacks/head/media.cfg (+1/-1)
stacks/head/phone.cfg (+1/-1)
stacks/head/sdk.cfg (+1/-1)
To merge this branch: bzr merge lp:~ken-vandine/cupstream2distro-config/autopilot-touch
Reviewer Review Type Date Requested Status
Łukasz Zemczak Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+163037@code.launchpad.net

Commit message

Dropped autopilot-phablet from testpackages, we added it as a temporary fix.

Description of the change

Dropped autopilot-phablet from testpackages, we added it as a temporary fix.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Now that autopilot 1.3 is out, this is +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'stacks/head/apps.cfg'
2--- stacks/head/apps.cfg 2013-05-03 19:40:32 +0000
3+++ stacks/head/apps.cfg 2013-05-08 19:25:29 +0000
4@@ -11,7 +11,7 @@
5 - hud
6 test_parameters:
7 packages: qmlscene qtdeclarative5-localstorage-plugin libqt5sql5-sqlite julius julius-voxforge libhud-client2 libhud-qt1 qtdeclarative5-hud1.0 libhud1 libpocketsphinx1 libqt53d5 libqt5dbus5 libqt5graphicaleffects5 libqt5gui5 libqt5location5 libqt5network5 libqt5opengl5 libqt5printsupport5 libqt5qml5 libqt5quick5 libqt5sensors5 libqt5sql5 libqt5svg5 libqt5v8-5 libqt5webkit5 libqt5webkit5-qmlwebkitplugin libqt5widgets5 libsphinxbase1 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-sync0 pocketsphinx-hmm-en-hub4wsj pocketsphinx-lm-en-hub4 pocketsphinx-utils qtdeclarative5-qtquick2-plugin qtdeclarative5-ubuntu-ui-toolkit-plugin qtdeclarative5-window-plugin ubuntu-ui-toolkit-theme libqt5core5 gallery-app notes-app webbrowser-app
8- testpackages: autopilot-phablet gallery-app-autopilot notes-app-autopilot webbrowser-app-autopilot
9+ testpackages: gallery-app-autopilot notes-app-autopilot webbrowser-app-autopilot
10 tests: gallery_app notes_app webbrowser_app
11 ci_default:
12 use_description_for_commit: True
13
14=== modified file 'stacks/head/media.cfg'
15--- stacks/head/media.cfg 2013-05-03 00:07:01 +0000
16+++ stacks/head/media.cfg 2013-05-08 19:25:29 +0000
17@@ -12,7 +12,7 @@
18 - sdk
19 test_parameters:
20 packages: camera-app cameraplugin-aal cameraplugin-fake gstreamer0.10-ffmpeg hud julius julius-voxforge libavcodec53 libavformat53 libavutil51 libgsm1 libhud-client2 libhud-qt1 qtdeclarative5-hud1.0 libhud1 libpocketsphinx1 libpostproc52 libqgsttools-p1 libqt5core5 libqt5dbus5 libqt5graphicaleffects5 libqt5gui5 libqt5multimedia5 libqt5multimediaquick-p5 libqt5network5 libqt5qml5 libqt5quick5 libqt5svg5 libqt5v8-5 libqt5widgets5 libqt5xmlpatterns5 libschroedinger-1.0-0 libsphinxbase1 libswscale2 libva1 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-sync0 mediaplayer-app pocketsphinx-hmm-en-hub4wsj pocketsphinx-lm-en-hub4 pocketsphinx-utils qtdeclarative5-qtmultimedia-plugin qtdeclarative5-qtquick2-plugin qtdeclarative5-ubuntu-ui-toolkit-plugin qtdeclarative5-window-plugin qtdeclarative5-xmllistmodel-plugin ubuntu-ui-toolkit-theme
21- testpackages: autopilot-phablet camera-app-autopilot mediaplayer-app-autopilot
22+ testpackages: camera-app-autopilot mediaplayer-app-autopilot
23 tests: camera_app mediaplayer_app
24 ci_default:
25 configurations:
26
27=== modified file 'stacks/head/phone.cfg'
28--- stacks/head/phone.cfg 2013-05-01 15:33:24 +0000
29+++ stacks/head/phone.cfg 2013-05-08 19:25:29 +0000
30@@ -13,7 +13,7 @@
31 - sdk
32 test_parameters:
33 packages: hud julius julius-voxforge libhud-client2 libhud-qt1 qtdeclarative5-hud1.0 libhud1 libpocketsphinx1 libqgsttools-p1 libqt5contacts5 libqt5dbus5 libqt5graphicaleffects5 libqt5gui5 libqt5multimedia5 libqt5network5 libqt5qml5 libqt5quick5 libqt5svg5 libqt5v8-5 libqt5versit5 libqt5widgets5 libqt5xml5 libqtglib-2.0-0 libsphinxbase1 libtelepathy-logger-qt5-0 libtelepathy-qt5-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-sync0 ofono pocketsphinx-hmm-en-hub4wsj pocketsphinx-lm-en-hub4 pocketsphinx-utils python-telepathy qtdeclarative5-qtquick2-plugin qtdeclarative5-ubuntu-ui-toolkit-plugin telepathy-ofono ubuntu-ui-toolkit-theme libqt5core5 phone-app
34- testpackages: autopilot-phablet phone-app-autopilot
35+ testpackages: phone-app-autopilot
36 tests: phone_app
37 ci_default:
38 configurations:
39
40=== modified file 'stacks/head/sdk.cfg'
41--- stacks/head/sdk.cfg 2013-05-02 11:43:24 +0000
42+++ stacks/head/sdk.cfg 2013-05-08 19:25:29 +0000
43@@ -27,7 +27,7 @@
44 use_description_for_commit: True
45 test_parameters:
46 packages: qmlscene qtdeclarative5-qtmultimedia-plugin qtdeclarative5-xmllistmodel-plugin libqt5svg5 libqt5dbus5 libqt5gui5 libqt5qml5 libqt5quick5 libqt5test5 libqt5graphicaleffects5 libqt5svg5 qtdeclarative5-qtquick2-plugin qtdeclarative5-window-plugin libqt5widgets5 libqt5core5 qtdeclarative5-ubuntu-ui-toolkit-plugin ubuntu-ui-toolkit-doc ubuntu-ui-toolkit-examples ubuntu-ui-toolkit-theme
47- testpackages: autopilot-phablet ubuntu-ui-toolkit-autopilot
48+ testpackages: ubuntu-ui-toolkit-autopilot
49 tests: UbuntuUiToolkit
50 projects:
51 ubuntu-ui-toolkit:

Subscribers

People subscribed via source and target branches

to all changes: