Mir

Merge lp:~thomas-voss/mir/test-support-for-dropped-fb-support into lp:mir

  1. test-support-for-dropped-fb-support
  2. Merge into development-branch
Proposed by Thomas Voß
Status: Superseded
Proposed branch: lp:~thomas-voss/mir/test-support-for-dropped-fb-support
Merge into: lp:mir
Diff against target: 74 lines (+10/-4) (has conflicts)
4 files modified
debian/changelog (+6/-0)
src/client/symbols.map (+2/-2)
src/platforms/android/server/android_alloc_adaptor.cpp (+1/-1)
src/platforms/android/server/server_render_window.cpp (+1/-1)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~thomas-voss/mir/test-support-for-dropped-fb-support
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Mir development team Pending
Review via email: mp+281299@code.launchpad.net

This proposal has been superseded by a proposal from 2015-12-23.

Commit message

Test for supporting implementations that have dropped fb support.

Description of the change

Test for supporting implementations that have dropped fb support.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3186
http://jenkins.qa.ubuntu.com/job/mir-ci/5933/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5427/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4334
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5380/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/259
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/259/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/259
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/259/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5377/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5933/rebuild

review: Needs Fixing (continuous-integration)
lp:~thomas-voss/mir/test-support-for-dropped-fb-support updated
3187. By Thomas Voß

Fold in previous patches.
Temporarily disable execution of test suite during package builds.
Ensure O_LARGEFILE.

3188. By Thomas Voß

Make sure we choose a configuration that supports pbuffer surface creation.

3189. By Thomas Voß

Temporary hack to allow supporting platforms with and without gralloc fb support.

Unmerged revisions

3189. By Thomas Voß

Temporary hack to allow supporting platforms with and without gralloc fb support.

3188. By Thomas Voß

Make sure we choose a configuration that supports pbuffer surface creation.

3187. By Thomas Voß

Fold in previous patches.
Temporarily disable execution of test suite during package builds.
Ensure O_LARGEFILE.

3186. By Thomas Voß

Test for supporting implementations that have dropped fb support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-12-23 02:29:08 +0000
3+++ debian/changelog 2015-12-23 14:07:34 +0000
4@@ -1,3 +1,4 @@
5+<<<<<<< TREE
6 mir (0.19.0-0ubuntu1) UNRELEASED; urgency=medium
7
8 * placeholder for 0.19 release
9@@ -7,6 +8,11 @@
10 mir (0.18.0+16.04.20151216.1-0ubuntu1) xenial; urgency=medium
11
12 [ Kevin DuBois ]
13+=======
14+mir (0.18.0+16.04.20151216.1-0ubuntu1) xenial; urgency=medium
15+
16+ [ Kevin DuBois ]
17+>>>>>>> MERGE-SOURCE
18 * New upstream release 0.18.0 (https://launchpad.net/mir/+milestone/0.18.0)
19 - ABI summary: Only servers need rebuilding;
20 . Mirclient ABI unchanged at 9
21
22=== modified file 'src/client/symbols.map'
23--- src/client/symbols.map 2015-12-10 10:01:30 +0000
24+++ src/client/symbols.map 2015-12-23 14:07:34 +0000
25@@ -198,7 +198,7 @@
26 mir_surface_output_event_get_scale;
27 } MIR_CLIENT_9.2;
28
29-MIR_CLIENT_unreleased {
30+MIR_CLIENT_9v18 {
31 global:
32 mir_buffer_stream_get_error_message;
33 mir_surface_output_event_get_output_id;
34@@ -244,7 +244,7 @@
35 };
36 };
37
38-MIR_CLIENT_DETAIL_unreleased {
39+MIR_CLIENT_DETAIL_9v18 {
40 global:
41 extern "C++" {
42 mir::events::set_modifier*;
43
44=== modified file 'src/platforms/android/server/android_alloc_adaptor.cpp'
45--- src/platforms/android/server/android_alloc_adaptor.cpp 2015-12-11 12:31:47 +0000
46+++ src/platforms/android/server/android_alloc_adaptor.cpp 2015-12-23 14:07:34 +0000
47@@ -104,7 +104,7 @@
48 case mga::BufferUsage::use_hardware:
49 return (GRALLOC_USAGE_HW_TEXTURE | GRALLOC_USAGE_HW_RENDER);
50 case mga::BufferUsage::use_framebuffer_gles:
51- return (GRALLOC_USAGE_HW_RENDER | GRALLOC_USAGE_HW_COMPOSER | GRALLOC_USAGE_HW_FB);
52+ return (GRALLOC_USAGE_HW_RENDER | GRALLOC_USAGE_HW_COMPOSER | GRALLOC_USAGE_HW_TEXTURE);
53 case mga::BufferUsage::use_software:
54 return (GRALLOC_USAGE_SW_WRITE_OFTEN | GRALLOC_USAGE_SW_READ_OFTEN | GRALLOC_USAGE_HW_COMPOSER | GRALLOC_USAGE_HW_TEXTURE);
55 default:
56
57=== modified file 'src/platforms/android/server/server_render_window.cpp'
58--- src/platforms/android/server/server_render_window.cpp 2015-11-24 14:18:33 +0000
59+++ src/platforms/android/server/server_render_window.cpp 2015-12-23 14:07:34 +0000
60@@ -93,7 +93,7 @@
61 case NATIVE_WINDOW_CONCRETE_TYPE:
62 return NATIVE_WINDOW_FRAMEBUFFER;
63 case NATIVE_WINDOW_CONSUMER_USAGE_BITS:
64- return GRALLOC_USAGE_HW_RENDER | GRALLOC_USAGE_HW_COMPOSER | GRALLOC_USAGE_HW_FB;
65+ return GRALLOC_USAGE_HW_RENDER | GRALLOC_USAGE_HW_COMPOSER | GRALLOC_USAGE_HW_TEXTURE;
66 default:
67 {
68 std::stringstream sstream;
69
70=== modified file 'src/platforms/mesa/server/kms/platform_symbols.cpp'
71=== modified file 'src/server/scene/surface_stack.cpp'
72=== modified file 'src/server/scene/surface_stack.h'
73=== modified file 'tests/unit-tests/scene/test_surface_stack.cpp'
74=== modified file 'tools/setup-partial-armhf-chroot.sh'

Subscribers

People subscribed via source and target branches