Merge lp://qastaging/~vanvugt/mir/output-type-names into lp://qastaging/mir
Status: | Merged |
---|---|
Approved by: | Daniel van Vugt |
Approved revision: | no longer in the source branch. |
Merged at revision: | 3700 |
Proposed branch: | lp://qastaging/~vanvugt/mir/output-type-names |
Merge into: | lp://qastaging/mir |
Diff against target: |
373 lines (+122/-91) 12 files modified
include/client/mir_toolkit/mir_display_configuration.h (+16/-0) src/client/display_configuration_api.cpp (+11/-1) src/client/symbols.map (+2/-0) src/common/CMakeLists.txt (+1/-0) src/common/output_type_names.cpp (+51/-0) src/common/symbols.map (+7/-0) src/include/common/mir/output_type_names.h (+26/-0) src/platform/graphics/display_configuration.cpp (+2/-29) src/platforms/common/server/kms-utils/CMakeLists.txt (+1/-0) src/platforms/common/server/kms-utils/kms_connector.cpp (+2/-29) src/server/report/logging/display_configuration_report.cpp (+2/-6) src/utils/out.c (+1/-26) |
To merge this branch: | bzr merge lp://qastaging/~vanvugt/mir/output-type-names |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Chris Halse Rogers | Needs Fixing | ||
Alan Griffiths | Approve | ||
Mir CI Bot | continuous-integration | Approve | |
Kevin DuBois (community) | Approve | ||
Review via email:
|
Commit message
Deduplicate output type name lookup tables.
Surprisingly some were incomplete (missing Virtual):
src/platform/
src/platforms
src/server/
and one was plain wrong (missing S-Video):
src/platform/
I wonder if the missing entries might explain some crashes in
VMs as array overruns...?
Description of the change
Sadly we have three different enums for output type and they're all equivalent. I've cleaned that problem up a little in a separate proposal:
https:/
PASSED: Continuous integration, rev:3696 /mir-jenkins. ubuntu. com/job/ mir-ci/ 1679/ /mir-jenkins. ubuntu. com/job/ build-mir/ 2104 /mir-jenkins. ubuntu. com/job/ build-0- fetch/2166 /mir-jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= vivid+overlay/ 2157 /mir-jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= xenial+ overlay/ 2157 /mir-jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= yakkety/ 2157 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= clang,platform= mesa,release= yakkety/ 2132 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= clang,platform= mesa,release= yakkety/ 2132/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= xenial+ overlay/ 2132 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= xenial+ overlay/ 2132/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= yakkety/ 2132 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= yakkety/ 2132/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= android, release= vivid+overlay/ 2132 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= android, release= vivid+overlay/ 2132/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= mesa,release= xenial+ overlay/ 2132 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= mesa,release= xenial+ overlay/ 2132/artifact/ output/ *zip*/output. zip
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild: /mir-jenkins. ubuntu. com/job/ mir-ci/ 1679/rebuild
https:/