Merge lp:~compiz-team/compiz/compiz.fix_1158267.update-tests into lp:compiz/0.9.11
Status: | Merged |
---|---|
Approved by: | Francis Ginther |
Approved revision: | 3756 |
Merged at revision: | 3787 |
Proposed branch: | lp:~compiz-team/compiz/compiz.fix_1158267.update-tests |
Merge into: | lp:compiz/0.9.11 |
Diff against target: |
448 lines (+259/-56) 3 files modified
plugins/decor/src/decor.cpp (+57/-48) plugins/decor/tests/acceptance/xorg-gtest/CMakeLists.txt (+4/-2) plugins/decor/tests/acceptance/xorg-gtest/compiz_decor_acceptance_tests.cpp (+198/-6) |
To merge this branch: | bzr merge lp:~compiz-team/compiz/compiz.fix_1158267.update-tests |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Christopher Townsend (community) | Approve | ||
Daniel van Vugt | Pending | ||
MC Return | Pending | ||
Review via email: mp+176801@code.launchpad.net |
This proposal supersedes a proposal from 2013-07-22.
Commit message
Ensure that the frame region is always set as soon as the window is decorated.
Further ensure that the window decoration isn't needlessly reset if the
window already had one.
Refactored XShape usage into a common function.
Added tests to verify the behaviour of shape set on initially creating
a decorated window and also upon changing the input frame window shape
(LP: #1158267)
Description of the change
Ensure that the frame region is always set as soon as the window is decorated.
Further ensure that the window decoration isn't needlessly reset if the
window already had one.
Refactored XShape usage into a common function.
Added tests to verify the behaviour of shape set on initially creating
a decorated window and also upon changing the input frame window shape
(LP: #1158267)
FAILED: Continuous integration, rev:3756 jenkins. qa.ubuntu. com/job/ compiz- ci/261/ jenkins. qa.ubuntu. com/job/ compiz- gles-ci/ ./build= pbuilder, distribution= raring, flavor= amd64/302 jenkins. qa.ubuntu. com/job/ compiz- saucy-amd64- ci/74/console jenkins. qa.ubuntu. com/job/ compiz- saucy-armhf- ci/74/console jenkins. qa.ubuntu. com/job/ compiz- saucy-i386- ci/74/console
http://
Executed test runs:
SUCCESS: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins: 8080/job/ compiz- ci/261/ rebuild
http://