cupstream2distro Configuration

Merge lp:~sil2100/cupstream2distro-config/media_stack_fix into lp:cupstream2distro-config

  1. media_stack_fix
  2. Merge into trunk
Proposed by Łukasz Zemczak
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: 527
Merged at revision: 526
Proposed branch: lp:~sil2100/cupstream2distro-config/media_stack_fix
Merge into: lp:cupstream2distro-config
Diff against target: 25 lines (+2/-2)
2 files modified
stacks/head/media.cfg (+1/-1)
stacks/head/sdk.cfg (+1/-1)
To merge this branch: bzr merge lp:~sil2100/cupstream2distro-config/media_stack_fix
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Didier Roche-Tolomelli Approve
Review via email: mp+175278@code.launchpad.net

Commit message

Fix packages list for media stack. Also, add an additional test to SDK test suite.

Description of the change

Fix packages list for media stack

To post a comment you must log in.
lp:~sil2100/cupstream2distro-config/media_stack_fix updated
527. By Łukasz Zemczak

Add one additional test to the SDK check suite

Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

sweet!

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'stacks/head/media.cfg'
2--- stacks/head/media.cfg 2013-07-12 11:48:52 +0000
3+++ stacks/head/media.cfg 2013-07-17 13:25:28 +0000
4@@ -12,7 +12,7 @@
5 - sdk
6 test_parameters:
7 apmachines: ati intel
8- packages: libqt5multimedia5-plugins camera-app cameraplugin-fake hud gstreamer0.10-ffmpeg libhud-client2 libhud-qt1 qtdeclarative5-hud1.0 libhud2 libqgsttools-p1 libqt5qml-graphicaleffects libqt5multimedia5 libqt5multimediaquick-p5 libqt5svg5 qtdeclarative5-qtmultimedia-plugin qtdeclarative5-qtquick2-plugin mediaplayer-app qtdeclarative5-ubuntu-ui-toolkit-plugin ubuntu-ui-toolkit-theme qtdeclarative5-xmllistmodel-plugin libavcodec53 libavformat53 libavutil51 libgsm1 libpostproc52 libqdjango-db0 libqt5xmlpatterns5 libschroedinger-1.0-0 libswscale2 libusermetricsinput1 libva1 qtdeclarative5-window-plugin sqlite3 usermetricsservice
9+ packages: libunity-action-qt1 qtdeclarative5-unity-action-plugin libqt5multimedia5-plugins camera-app cameraplugin-fake hud gstreamer0.10-ffmpeg libhud-client2 libhud-qt1 qtdeclarative5-hud1.0 libhud2 libqgsttools-p1 libqt5qml-graphicaleffects libqt5multimedia5 libqt5multimediaquick-p5 libqt5svg5 qtdeclarative5-qtmultimedia-plugin qtdeclarative5-qtquick2-plugin mediaplayer-app qtdeclarative5-ubuntu-ui-toolkit-plugin ubuntu-ui-toolkit-theme qtdeclarative5-xmllistmodel-plugin libavcodec53 libavformat53 libavutil51 libgsm1 libpostproc52 libqdjango-db0 libqt5xmlpatterns5 libschroedinger-1.0-0 libswscale2 libusermetricsinput1 libva1 qtdeclarative5-window-plugin sqlite3 usermetricsservice
10 testpackages: camera-app-autopilot mediaplayer-app-autopilot
11 tests: camera_app mediaplayer_app
12 ci_default:
13
14=== modified file 'stacks/head/sdk.cfg'
15--- stacks/head/sdk.cfg 2013-07-17 08:24:06 +0000
16+++ stacks/head/sdk.cfg 2013-07-17 13:25:28 +0000
17@@ -31,7 +31,7 @@
18 packages: hud libhud2 libunity-action-qt1 qtdeclarative5-unity-action-plugin libqt5multimedia5 libqt5multimedia5-plugins libqt5multimediaquick-p5 libqt5xmlpatterns5 libqgsttools-p1 qmlscene qtdeclarative5-qtmultimedia-plugin qtdeclarative5-xmllistmodel-plugin qtdeclarative5-qtquick2-plugin libqt5svg5 libqt5qml-graphicaleffects qtdeclarative5-window-plugin qtdeclarative5-ubuntu-ui-toolkit-plugin ubuntu-html5-theme ubuntu-html5-theme-examples ubuntu-ui-toolkit-doc ubuntu-ui-toolkit-examples ubuntu-ui-toolkit-theme
19 testpackages: ubuntu-html5-theme-autopilot ubuntu-ui-toolkit-autopilot share-app-autopilot notes-app-autopilot webbrowser-app-autopilot gallery-app-autopilot
20 # We also run some Apps test here to make sure SDK does not break touch apps
21- tests: ubuntu_html5_theme UbuntuUiToolkit gallery_app.tests.test_photos_view.TestPhotosView.test_open_photo gallery_app.tests.test_album_view.TestAlbumView.test_album_view_open_photo share_app.tests.test_share.TestShare.test_message_area_typing notes_app.tests.test_delete.TestDelete.test_slide_and_put_back notes_app.tests.test_create.TestCreate.test_note_expand_and_unexpand webbrowser_app.tests.test_addressbar_selection.TestAddressBarSelection.test_click_to_select webbrowser_app.tests.test_tabs.TestTabs webbrowser_app.tests.test_toolbar.TestToolbar
22+ tests: ubuntu_html5_theme UbuntuUiToolkit gallery_app.tests.test_photos_view.TestPhotosView.test_open_photo gallery_app.tests.test_album_view.TestAlbumView.test_album_view_open_photo gallery_app.tests.test_photo_viewer.TestPhotoViewer.test_nav_bar_share_button share_app.tests.test_share.TestShare.test_message_area_typing notes_app.tests.test_delete.TestDelete.test_slide_and_put_back notes_app.tests.test_create.TestCreate.test_note_expand_and_unexpand webbrowser_app.tests.test_addressbar_selection.TestAddressBarSelection.test_click_to_select webbrowser_app.tests.test_tabs.TestTabs webbrowser_app.tests.test_toolbar.TestToolbar
23 projects:
24 ubuntu-ui-toolkit:
25 hooks: D09add_ppa~canonical-qt5-edgers~qt5-proper A10checklicenseheaders C09copy_results B09copy_results B10gcovr_run H10enable_coverage D10install_lcov

Subscribers

People subscribed via source and target branches

to all changes: