lp:~compiz-team/compiz/compiz.fix_1178514

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:compiz/0.9.10 at revision 3694

Sam Spilsbury: Approve on 2013-05-12

PS Jenkins bot (community): Approve (continuous-integration) on 2013-05-11

MC Return: Approve on 2013-05-10

Diff: 234 lines (+161/-10)

5 files modified

plugins/decor/src/pixmap-requests/tests/integration/xorg-gtest/CMakeLists.txt (+1/-1)
tests/acceptance-tests/xorg-gtest/tests/CMakeLists.txt (+1/-1)
tests/system/xorg-gtest/tests/CMakeLists.txt (+1/-1)
tests/xorg-gtest/CMakeLists.txt (+4/-7)
tests/xorg-gtest/src/compiz_xorg_gtest_main.cpp (+154/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1178514: xorg-gtest tests always fail when two test runs are run on the same machine in parallel

High

Fix Released

Link a bug report

Related blueprints

3693. By Sam Spilsbury on 2013-05-11

Fix truncated line

3692. By Sam Spilsbury on 2013-05-10

Fix accidentally removed variable

3691. By Sam Spilsbury on 2013-05-10

Fix indentation

3690. By Sam Spilsbury on 2013-05-10

Fixes LP:#1178514

3689. By Sam Spilsbury on 2013-05-10

Try to launch tests on another server if there's tests running in parallel.

Provide our own compiz_xorg_gtest_main and subclass xorg::testing::Environment
to try and launch tests on another display if there's tests running on
one already.

This isn't by any means perfect - there are still race conditions
surrounding XOpenDisplay and parallel test runs but it makes any
time gap for conditions such as:
 1. Client has a server grab on the display we're checking
    and won't let go.
 2. Two servers get launched on one port and one set of tests
    interfere with the other.

It also means that we're now unable to configure the display port,
log file and config file on the command line. But we weren't using that
anyways.

Finally, the logs now point to /tmp/Compiz.Xorg.GTest.displaynum.log

(LP: #1178514)

3688. By MC Return on 2013-05-09

Opacity, Brightness and Saturation (obs) code cleanup:

Replaced #define MODIFIER_COUNT 3 with const unsigned short MODIFIER_COUNT = 3;
(the variable MODIFIER_COUNT is needed in obs.h and obs.cpp).
Use prefix instead of postfix increment.
Merged if condition checks.
Declaration and assignment of local variables in one line.
Removed redundant brackets.
Added and removed newlines if appropriate.
Indentation fixes.

Approved by PS Jenkins bot, Sam Spilsbury.

3687. By MC Return on 2013-05-09

Opacity, Brightness and Saturation (obs) .xml cleanup:

Better plugin description.
Improved setting names and tooltips.

Approved by PS Jenkins bot, Sam Spilsbury.

3686. By Christopher Townsend on 2013-05-08

Fixed issue where minimizing an unredirect full screen window would repaint the full screen window after minimizing it even though it isn't really there.
. Fixes: https://bugs.launchpad.net/bugs/1053895.

Approved by PS Jenkins bot, Sam Spilsbury.

3685. By MC Return on 2013-05-06

*Shift Window Switcher, new features:

Implemented new option to adjust the vertical offset of the text placement
and fixed vertical placement calculation for top and bottom positions.
The default offset is 50 pixels now.
Removed hardcoded and redundant float border.

Use 256x256 pixels resolution for icon textures, instead of 96x96.
Minor indentation fixes.

(LP: #1173684). Fixes: https://bugs.launchpad.net/bugs/1173684.

Approved by PS Jenkins bot, Sam Spilsbury.

3684. By MC Return on 2013-04-28

Ring Switcher .xml cleanup:

Better description of the "Ring Switcher".
Uppercase for titles.
More precise names for the tabs.
Improved tooltip wording and descriptions.
Changed the order of options in "General Options" tab:
"Ring Windows" and "Overlay Icon" options are now on top.

No settings have been changed.

Approved by PS Jenkins bot, Sam Spilsbury.