Compiz

Merge lp:~compiz-team/compiz/compiz.fix_1120009.3 into lp:compiz/0.9.9

  1. compiz.fix_1120009.3
  2. Merge into 0.9.9
Proposed by Sam Spilsbury
Status: Superseded
Proposed branch: lp:~compiz-team/compiz/compiz.fix_1120009.3
Merge into: lp:compiz/0.9.9
Diff against target: 666 lines (+311/-126)
14 files modified
CMakeLists.txt (+35/-38)
cmake/CompizCommon.cmake (+1/-0)
cmake/FindGoogleTest.cmake (+46/-0)
cmake/FindXorgGTest.cmake (+43/-0)
cmake/GoogleTest.cmake (+20/-0)
cmake/XorgGTest.cmake (+14/-0)
debian/changelog (+20/-0)
debian/control (+3/-0)
debian/patches/ccp_plugin.patch (+46/-6)
debian/patches/ubuntu-config.patch (+24/-0)
tests/system/xorg-gtest/CMakeLists.txt (+3/-31)
tests/xorg-gtest/CMakeLists.txt (+49/-0)
tests/xorg-gtest/src/CMakeLists.txt (+0/-51)
tests/xorg-gtest/src/compiz-xorg-gtest.cpp (+7/-0)
To merge this branch: bzr merge lp:~compiz-team/compiz/compiz.fix_1120009.3
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
MC Return Pending
Brandon Schaefer Pending
Review via email: mp+148600@code.launchpad.net

This proposal supersedes a proposal from 2013-02-14.

This proposal has been superseded by a proposal from 2013-02-15.

Commit message

Enable xorg-gtest tests by default and build in CI.

This change also refactors a number of parts of the code to find and build the tests. It puts the logic to find Google Test and Xorg GTest in their own cmake files, and also splits the find logic with the build logic. Finally, it makes the xorg-gtest variables available to all subdirectories and not just the ones under tests/.

This change also refreshes some distro patches. A new option was added to not auto-load the ccp plugin, and also modifies one of the tests depending on a modified setting value.

(LP: #1120009)

Description of the change

Enable xorg-gtest tests by default and build in CI.

This change also refactors a number of parts of the code to find and build the tests. It puts the logic to find Google Test and Xorg GTest in their own cmake files, and also splits the find logic with the build logic. Finally, it makes the xorg-gtest variables available to all subdirectories and not just the ones under tests/

This change also refreshes some distro patches. A new option was added to not auto-load the ccp plugin, and also modifies one of the tests depending on a modified setting value.

(LP: #1120009)

To post a comment you must log in.
Revision history for this message
MC Return (mc-return) wrote : Posted in a previous version of this proposal

More useful tests can only be good.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:3555
http://jenkins.qa.ubuntu.com/job/compiz-ci/9/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-clang-ci/./build=pbuilder,distribution=quantal,flavor=amd64/47/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=quantal,flavor=amd64/46/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-pbuilder/./build=pbuilder,distribution=quantal,flavor=amd64/398/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/compiz-ci/9//rebuild/?

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:3557
http://jenkins.qa.ubuntu.com/job/compiz-ci/12/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-clang-ci/./build=pbuilder,distribution=quantal,flavor=amd64/50/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=quantal,flavor=amd64/49/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-pbuilder/./build=pbuilder,distribution=quantal,flavor=amd64/401/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/compiz-ci/12//rebuild/?

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:3558
http://jenkins.qa.ubuntu.com/job/compiz-ci/20/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-clang-ci/./build=pbuilder,distribution=quantal,flavor=amd64/58/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=quantal,flavor=amd64/57/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-pbuilder/./build=pbuilder,distribution=quantal,flavor=amd64/409/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/compiz-ci/20//rebuild/?

review: Needs Fixing (continuous-integration)
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote : Posted in a previous version of this proposal

Cool, looks good to me. Yay for fixing that mis leading warning message

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:3559
http://jenkins.qa.ubuntu.com/job/compiz-ci/25/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-clang-ci/./build=pbuilder,distribution=quantal,flavor=amd64/63/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=quantal,flavor=amd64/62/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-pbuilder/./build=pbuilder,distribution=quantal,flavor=amd64/414/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/compiz-ci/25//rebuild/?

review: Needs Fixing (continuous-integration)
Revision history for this message
Sam Spilsbury (smspillaz) wrote : Posted in a previous version of this proposal

Argh. I thought we upgraded xorg-gtest in the distro to 0.8.

I'll have to leave this as WIP until that happens.

Revision history for this message
Sam Spilsbury (smspillaz) wrote : Posted in a previous version of this proposal

Okay, I've been informed that we have 0.7 in the distro, and that is only in raring. I've bumped the required version and mmrazik has bumped the distro in CI.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:3560
http://jenkins.qa.ubuntu.com/job/compiz-ci/30/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-clang-ci/./build=pbuilder,distribution=raring,flavor=amd64/68/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=raring,flavor=amd64/67/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-pbuilder/./build=pbuilder,distribution=raring,flavor=amd64/419/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/compiz-ci/30//rebuild/?

review: Needs Fixing (continuous-integration)
Revision history for this message
Sam Spilsbury (smspillaz) wrote : Posted in a previous version of this proposal

Seems like the tests are failing because the xserver isn't sending back the events we expect. Debugging this now.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:3561
http://jenkins.qa.ubuntu.com/job/compiz-ci/32/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-clang-ci/./build=pbuilder,distribution=raring,flavor=amd64/70/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=raring,flavor=amd64/69/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-pbuilder/./build=pbuilder,distribution=raring,flavor=amd64/421/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/compiz-ci/32//rebuild/?

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:3562
http://jenkins.qa.ubuntu.com/job/compiz-ci/33/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-clang-ci/./build=pbuilder,distribution=raring,flavor=amd64/71/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=raring,flavor=amd64/70/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-pbuilder/./build=pbuilder,distribution=raring,flavor=amd64/422/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/compiz-ci/33//rebuild/?

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:3562
http://jenkins.qa.ubuntu.com/job/compiz-ci/34/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-clang-ci/./build=pbuilder,distribution=raring,flavor=amd64/72/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=raring,flavor=amd64/71/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-pbuilder/./build=pbuilder,distribution=raring,flavor=amd64/423/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/compiz-ci/34//rebuild/?

review: Needs Fixing (continuous-integration)
Revision history for this message
Sam Spilsbury (smspillaz) wrote : Posted in a previous version of this proposal

Okay, I think the cause of the failures was the ccp-autoloading distro patch. That was just causing problems with the child process, but our test framework doesn't handle the case of a crashing compiz yet. I've filed bug 1124843 about that.

Revision history for this message
Sam Spilsbury (smspillaz) wrote : Posted in a previous version of this proposal

(Resubmitted with the correct candidate branch)

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:3563
http://jenkins.qa.ubuntu.com/job/compiz-ci/35/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-clang-ci/./build=pbuilder,distribution=raring,flavor=amd64/73/console
    None: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=raring,flavor=amd64/72/console
    None: http://jenkins.qa.ubuntu.com/job/compiz-pbuilder/./build=pbuilder,distribution=raring,flavor=amd64/424/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/compiz-ci/35//rebuild/?

review: Needs Fixing (continuous-integration)
Revision history for this message
Martin Mrazik (mrazik) wrote : Posted in a previous version of this proposal

I killed the previous job and triggered a new one to check if disabling tests on clang works.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:3563
http://jenkins.qa.ubuntu.com/job/compiz-ci/36/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-clang-ci/./build=pbuilder,distribution=raring,flavor=amd64/74/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/compiz-ci/36//rebuild/?

review: Needs Fixing (continuous-integration)
Revision history for this message
Sam Spilsbury (smspillaz) wrote : Posted in a previous version of this proposal

No problem, thanks for the update.

On Thu, Feb 14, 2013 at 4:46 PM, Martin Mrazik
<email address hidden> wrote:
> I killed the previous job and triggered a new one to check if disabling tests on clang works.
> --
> https://code.launchpad.net/~compiz-team/compiz/compiz.fix_1120009.3/+merge/148371
> Your team Compiz Maintainers is subscribed to branch lp:compiz.

--
Sam Spilsbury

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:3563
http://jenkins.qa.ubuntu.com/job/compiz-ci/37/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-clang-ci/./build=pbuilder,distribution=raring,flavor=amd64/75/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=raring,flavor=amd64/74/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-pbuilder/./build=pbuilder,distribution=raring,flavor=amd64/426/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/compiz-ci/37//rebuild/?

review: Needs Fixing (continuous-integration)
lp:~compiz-team/compiz/compiz.fix_1120009.3 updated
3564. By Sam Spilsbury

Merge lp:compiz

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3564
http://jenkins.qa.ubuntu.com/job/compiz-ci/41/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=raring,flavor=amd64/78/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-pbuilder/./build=pbuilder,distribution=raring,flavor=amd64/430/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/compiz-ci/41//rebuild/?

review: Needs Fixing (continuous-integration)
lp:~compiz-team/compiz/compiz.fix_1120009.3 updated
3565. By Sam Spilsbury

Force stdout for all test processes

3566. By Sam Spilsbury

Force the stdout to remain open, and brute-force getting a connection.

This is really going thermonuclear on these failing tests :(

3567. By Sam Spilsbury

Don't make the first testparam an empty string for the non-wrapped tests

3568. By Sam Spilsbury

Let us know if we're running without ccp

3569. By Sam Spilsbury

Re-add the connection re-try logic

3570. By Sam Spilsbury

We already auto-add the ccp plugin in the source, no need for it to be
in the default plugins

3571. By Sam Spilsbury

Don't build xorg-gtest on ARM for now, as it doesn't compile

3572. By Sam Spilsbury

Merge lp:compiz

3573. By Sam Spilsbury

Also link in xext

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2013-02-13 13:55:52 +0000
3+++ CMakeLists.txt 2013-02-15 06:26:25 +0000
4@@ -22,6 +22,10 @@
5 # GSettings schema recompilation
6 include (CompizGSettings)
7
8+# Google Test and Xorg-GTest
9+include (GoogleTest)
10+include (XorgGTest)
11+
12 include (cmake/base.cmake)
13 # Check if specific function is present in library.
14 include (CheckFunctionExists)
15@@ -137,45 +141,38 @@
16
17 if (COMPIZ_BUILD_TESTING)
18
19- # Build Google Test and make its headers known
20- find_package (GTest)
21-
22- if (NOT GTEST_FOUND)
23-
24- # Check for google test and build it locally
25- set (GTEST_ROOT_DIR
26- "/usr/src/gtest" # Default value, adjustable by user with e.g., ccmake
27- CACHE
28- PATH
29- "Path to Google Test srcs"
30- FORCE
31- )
32-
33- find_path (GTEST_INCLUDE_DIR gtest/gtest.h)
34-
35- if (GTEST_INCLUDE_DIR)
36- add_subdirectory (${GTEST_ROOT_DIR}
37- gtest)
38- endif (GTEST_INCLUDE_DIR)
39-
40- set (GTEST_BOTH_LIBRARIES gtest gtest_main)
41- set (GTEST_FOUND TRUE)
42-
43- endif (NOT GTEST_FOUND)
44-
45- find_library (GMOCK_LIBRARY gmock)
46- find_library (GMOCK_MAIN_LIBRARY gmock_main)
47-
48- if (NOT GMOCK_LIBRARY OR NOT GMOCK_MAIN_LIBRARY OR NOT GTEST_FOUND)
49-
50- message ("Google Mock and Google Test not found - cannot build tests!")
51+ find_package (GoogleTest)
52+
53+ if (GOOGLE_TEST_AND_MOCK_FOUND)
54+
55+ build_google_test_locally (${CMAKE_BINARY_DIR}/__gtest)
56+
57+ if (BUILD_XORG_GTEST)
58+
59+ find_package (XorgGTest)
60+
61+ if (XORG_GTEST_FOUND)
62+
63+ build_xorg_gtest_locally (${CMAKE_BINARY_DIR}/__xorg_gtest)
64+
65+ else (XORG_GTEST_FOUND)
66+
67+ set (BUILD_XORG_GTEST FALSE)
68+
69+ endif (XORG_GTEST_FOUND)
70+
71+ endif (BUILD_XORG_GTEST)
72+
73+ else (GOOGLE_TEST_AND_MOCK_FOUND)
74+
75 set (COMPIZ_BUILD_TESTING OFF CACHE BOOL "" FORCE)
76-
77- else (NOT GMOCK_LIBRARY OR NOT GMOCK_MAIN_LIBRARY OR NOT GTEST_FOUND)
78-
79- include_directories (${GTEST_INCLUDE_DIRS})
80-
81- endif (NOT GMOCK_LIBRARY OR NOT GMOCK_MAIN_LIBRARY OR NOT GTEST_FOUND)
82+ set (BUILD_XORG_GTEST OFF CACHE BOOL "" FORCE)
83+
84+ endif (GOOGLE_TEST_AND_MOCK_FOUND)
85+
86+else (COMPIZ_BUILD_TESTING)
87+
88+ set (BUILD_XORG_GTEST OFF CACHE BOOL "" FORCE)
89
90 endif (COMPIZ_BUILD_TESTING)
91
92
93=== modified file 'cmake/CompizCommon.cmake'
94--- cmake/CompizCommon.cmake 2013-01-04 04:46:01 +0000
95+++ cmake/CompizCommon.cmake 2013-02-15 06:26:25 +0000
96@@ -31,6 +31,7 @@
97 option (COMPIZ_RUN_LDCONFIG "Leave OFF unless you need to run ldconfig after install")
98 option (COMPIZ_PACKAGING_ENABLED "Enable to manually set prefix, exec_prefix, libdir, includedir, datadir" OFF)
99 option (COMPIZ_BUILD_TESTING "Build Unit Tests" ON)
100+option (BUILD_XORG_GTEST "Build Xorg GTest integration tests" ON)
101
102 set (COMPIZ_DATADIR ${CMAKE_INSTALL_PREFIX}/share)
103 set (COMPIZ_METADATADIR ${CMAKE_INSTALL_PREFIX}/share/compiz)
104
105=== added file 'cmake/FindGoogleTest.cmake'
106--- cmake/FindGoogleTest.cmake 1970-01-01 00:00:00 +0000
107+++ cmake/FindGoogleTest.cmake 2013-02-15 06:26:25 +0000
108@@ -0,0 +1,46 @@
109+# Find Google Test and Google Mock, either with pkg-config or by
110+# searching the system install paths. This sets:
111+#
112+# GOOGLE_TEST_AND_MOCK_FOUND
113+# GTEST_INCLUDE_DIR
114+# GTEST_ROOT_DIR
115+# GMOCK_LIBRARY
116+# GMOCK_MAIN_LIBRARY
117+
118+find_package (GTest)
119+
120+if (NOT GTEST_FOUND)
121+
122+ # Check for google test and build it locally
123+ set (GTEST_ROOT_DIR
124+ "/usr/src/gtest" # Default value, adjustable by user with e.g., ccmake
125+ CACHE
126+ PATH
127+ "Path to Google Test srcs"
128+ FORCE)
129+
130+ find_path (GTEST_INCLUDE_DIR gtest/gtest.h)
131+
132+ set (GTEST_BOTH_LIBRARIES gtest gtest_main)
133+ set (GTEST_FOUND TRUE)
134+ set (GTEST_LOCAL_BUILD_REQUIRED TRUE)
135+
136+else (NOT GTEST_FOUND)
137+
138+ set (GTEST_LOCAL_BUILD_REQUIRED FALSE)
139+
140+endif (NOT GTEST_FOUND)
141+
142+find_library (GMOCK_LIBRARY gmock)
143+find_library (GMOCK_MAIN_LIBRARY gmock_main)
144+
145+if (NOT GMOCK_LIBRARY OR NOT GMOCK_MAIN_LIBRARY OR NOT GTEST_FOUND)
146+
147+ message ("Google Mock and Google Test not found - cannot build tests!")
148+ set (GOOGLE_TEST_AND_MOCK_FOUND OFF CACHE BOOL "" FORCE)
149+
150+else (NOT GMOCK_LIBRARY OR NOT GMOCK_MAIN_LIBRARY OR NOT GTEST_FOUND)
151+
152+ set (GOOGLE_TEST_AND_MOCK_FOUND ON CACHE BOOL "" FORCE)
153+
154+endif (NOT GMOCK_LIBRARY OR NOT GMOCK_MAIN_LIBRARY OR NOT GTEST_FOUND)
155
156=== added file 'cmake/FindXorgGTest.cmake'
157--- cmake/FindXorgGTest.cmake 1970-01-01 00:00:00 +0000
158+++ cmake/FindXorgGTest.cmake 2013-02-15 06:26:25 +0000
159@@ -0,0 +1,43 @@
160+# Find xorg-gtest,with pkg-config. This sets:
161+#
162+# XORG_GTEST_FOUND
163+# XORG_SERVER_INCLUDE_XORG_GTEST
164+# XORG_SERVER_GTEST_SRC
165+
166+# xorg-gtest
167+pkg_check_modules (XORG_SERVER
168+ xorg-gtest>=0.7.0
169+ xorg-server
170+ x11
171+ xi)
172+
173+if (XORG_SERVER_FOUND)
174+
175+ execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=prefix xorg-gtest OUTPUT_VARIABLE _xorg_gtest_prefix)
176+ execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=includedir xorg-gtest OUTPUT_VARIABLE _xorg_gtest_include_dir)
177+ execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=sourcedir xorg-gtest OUTPUT_VARIABLE _xorg_gtest_source_dir)
178+ execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=CPPflags xorg-gtest OUTPUT_VARIABLE _xorg_gtest_cflags)
179+
180+ string (STRIP ${_xorg_gtest_prefix} _xorg_gtest_prefix)
181+ string (STRIP ${_xorg_gtest_include_dir} _xorg_gtest_include_dir)
182+ string (STRIP ${_xorg_gtest_source_dir} _xorg_gtest_source_dir)
183+ string (STRIP ${_xorg_gtest_cflags} _xorg_gtest_cflags)
184+
185+ set (XORG_SERVER_GTEST_INCLUDES ${XORG_SERVER_INCLUDE_DIRS})
186+ set (XORG_SERVER_GTEST_LIBRARY_DIRS ${XORG_SERVER_LIBRARIES})
187+ set (XORG_SERVER_GTEST_LIBRARIES} ${XORG_SERVER_LIBRARIES})
188+ set (XORG_SERVER_INCLUDE_XORG_GTEST ${_xorg_gtest_include_dir} CACHE PATH "Path to Xorg GTest Headers")
189+ set (XORG_SERVER_GTEST_SRC ${_xorg_gtest_source_dir} CACHE PATH "Path to Xorg GTest Sources")
190+ set (XORG_SERVER_GTEST_CFLAGS ${_xorg_gtest_cflags})
191+ set (XORG_SERVER_GTEST_ROOT ${CMAKE_SOURCE_DIR}/tests/xorg-gtest CACHE PATH "Path to Xorg GTest CMake sources")
192+ set (COMPIZ_XORG_SYSTEM_TEST_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/tests/xorg-gtest/include CACHE PATH "Path to Compiz Xorg GTest Headers")
193+
194+ message (STATUS "Found xorg-gtest sources at " ${XORG_SERVER_GTEST_SRC})
195+ set (XORG_GTEST_FOUND ON)
196+
197+else (XORG_SERVER_FOUND)
198+
199+ message (WARNING "Could not found xorg-gtest, can't build xserver tests")
200+ set (XORG_GTEST_FOUND OFF)
201+
202+endif (XORG_SERVER_FOUND)
203
204=== added file 'cmake/GoogleTest.cmake'
205--- cmake/GoogleTest.cmake 1970-01-01 00:00:00 +0000
206+++ cmake/GoogleTest.cmake 2013-02-15 06:26:25 +0000
207@@ -0,0 +1,20 @@
208+# GoogleTest.cmake
209+# build_google_test_locally (dir) takes a subdirectory
210+# and builds Google Test in there locally if required
211+
212+function (build_google_test_locally build_directory)
213+
214+ if (GOOGLE_TEST_AND_MOCK_FOUND)
215+
216+ if (GTEST_LOCAL_BUILD_REQUIRED)
217+
218+ add_subdirectory (${GTEST_ROOT_DIR}
219+ ${build_directory})
220+
221+ endif (GTEST_LOCAL_BUILD_REQUIRED)
222+
223+ include_directories (${GTEST_INCLUDE_DIRS})
224+
225+ endif (GOOGLE_TEST_AND_MOCK_FOUND)
226+
227+endfunction ()
228
229=== added file 'cmake/XorgGTest.cmake'
230--- cmake/XorgGTest.cmake 1970-01-01 00:00:00 +0000
231+++ cmake/XorgGTest.cmake 2013-02-15 06:26:25 +0000
232@@ -0,0 +1,14 @@
233+# XorgGTest.cmake
234+#
235+# build_xorg_gtest_locally (dir) specifies a subdirectory to
236+# build xorg-gtest in locally
237+
238+function (build_xorg_gtest_locally build_directory)
239+
240+ if (XORG_GTEST_FOUND)
241+
242+ add_subdirectory (${XORG_SERVER_GTEST_ROOT} ${build_directory})
243+
244+ endif (XORG_GTEST_FOUND)
245+
246+endfunction ()
247
248=== modified file 'debian/changelog'
249--- debian/changelog 2013-02-08 04:01:48 +0000
250+++ debian/changelog 2013-02-15 06:26:25 +0000
251@@ -1,5 +1,25 @@
252 compiz (1:0.9.9~daily13.02.08-0ubuntu1) raring; urgency=low
253
254+ * debian/ccp_plugin.patch:
255+ - Also adjust test framework to pass the new option
256+
257+ -- Sam Spilsbury <smspillaz@interpol> Thu, 14 Feb 2013 12:49:11 +0800
258+
259+compiz (1:0.9.9~daily13.02.08-0ubuntu2) raring; urgency=low
260+
261+ * debian/control:
262+ - Add xorg-gtest, xserver-xorg-dev, libxi-dev as build-deps
263+ * debian/ubuntu_config.patch:
264+ - Adjust EWMH test for new value
265+ * debian/ccp_plugin.patch:
266+ - Added new option --no-auto-load-ccp to prevent the ccp
267+ plugin from autoloading. Useful for tests where having
268+ this behaviour just causes problems from unwanted side-effects
269+
270+ -- Sam Spilsbury <smspillaz@gmail.com> Thu, 14 Feb 2013 12:45:17 +0800
271+
272+compiz (1:0.9.9~daily13.02.08-0ubuntu1) raring; urgency=low
273+
274 [ MC Return ]
275 * thumbnail.xml.in needs some love (LP: #1113459)
276 * Thumbnail plugin: Window title text is rendered into transparency
277
278=== modified file 'debian/control'
279--- debian/control 2012-11-05 21:35:41 +0000
280+++ debian/control 2013-02-15 06:26:25 +0000
281@@ -34,8 +34,10 @@
282 libxext-dev,
283 libxdamage-dev (>=1:1.0.3),
284 libxfixes-dev (>= 1:4.0.1),
285+ libxi-dev,
286 libxinerama-dev,
287 libxml-parser-perl,
288+ libxorg-gtest-dev,
289 libxrandr-dev (>= 2:1.1.0.2),
290 libxrender-dev (>= 1:0.9.1),
291 libxcursor-dev,
292@@ -54,6 +56,7 @@
293 python-pyrex,
294 gnome-control-center-dev,
295 gsettings-desktop-schemas-dev,
296+ xserver-xorg-dev (>= 0.7.0),
297 Standards-Version: 3.9.3
298 # If you aren't a member of ~compiz-team but need to upload packaging changes,
299 # just go ahead. ~compiz-team will notice and sync up the code again.
300
301=== modified file 'debian/patches/ccp_plugin.patch'
302--- debian/patches/ccp_plugin.patch 2012-06-19 11:22:48 +0000
303+++ debian/patches/ccp_plugin.patch 2013-02-15 06:26:25 +0000
304@@ -1,8 +1,37 @@
305-Index: compiz-0.9.8/src/main.cpp
306-===================================================================
307---- compiz-0.9.8.orig/src/main.cpp 2012-05-29 12:09:56.000000000 +0200
308-+++ compiz-0.9.8/src/main.cpp 2012-05-30 16:29:24.940570174 +0200
309-@@ -146,23 +146,25 @@
310+--- a/src/main.cpp
311++++ b/src/main.cpp
312+@@ -38,6 +38,11 @@
313+ #include "privatescreen.h"
314+ #include "privatestackdebugger.h"
315+
316++namespace
317++{
318++bool autoAddCCP = true;
319++}
320++
321+ void
322+ CompManager::usage ()
323+ {
324+@@ -52,6 +57,7 @@
325+ " --debug Enable debug mode\n"
326+ " --version Show the program version\n"
327+ " --help Show this summary\n"
328++ " --no-auto-add-ccp Do not automatically load the ccp plugin\n"
329+ , programName);
330+ }
331+
332+@@ -116,6 +122,10 @@
333+ if (i + 1 < argc)
334+ clientId = argv[++i];
335+ }
336++ else if (!strcmp (argv[i], "--no-auto-add-ccp"))
337++ {
338++ autoAddCCP = false;
339++ }
340+ else if (*argv[i] == '-')
341+ {
342+ compLogMessage ("core", CompLogLevelWarn,
343+@@ -151,23 +161,25 @@
344
345 modHandler = new ModifierHandler ();
346
347@@ -22,7 +51,7 @@
348 list.push_back (value);
349 }
350 + }
351-+ else
352++ else if (autoAddCCP)
353 + list.push_back ("ccp");
354
355 value.set (CompOption::TypeString, list);
356@@ -33,3 +62,14 @@
357
358 if (!screen->init (displayName))
359 return false;
360+
361+--- a/tests/xorg-gtest/src/compiz-xorg-gtest.cpp
362++++ b/tests/xorg-gtest/src/compiz-xorg-gtest.cpp
363+@@ -389,6 +389,7 @@
364+ if (flags & ct::CompizProcess::ReplaceCurrentWM)
365+ args.push_back ("--replace");
366+
367++ args.push_back ("--no-auto-add-ccp");
368+ args.push_back ("--send-startup-message");
369+
370+ priv->mProcess.Start (compizBinaryPath, args);
371
372=== modified file 'debian/patches/ubuntu-config.patch'
373--- debian/patches/ubuntu-config.patch 2013-02-01 19:03:51 +0000
374+++ debian/patches/ubuntu-config.patch 2013-02-15 06:26:25 +0000
375@@ -204,6 +204,7 @@
376 <min>0</min>
377 <max>1</max>
378 <precision>0.01</precision>
379+
380 --- a/plugins/decor/decor.xml.in
381 +++ b/plugins/decor/decor.xml.in
382 @@ -31,7 +31,7 @@
383@@ -242,6 +243,7 @@
384 </option>
385 <option name="mipmap" type="bool">
386 <_short>Mipmap</_short>
387+
388 --- a/plugins/expo/expo.xml.in
389 +++ b/plugins/expo/expo.xml.in
390 @@ -17,6 +17,7 @@
391@@ -355,6 +357,7 @@
392 <min>0.0</min>
393 <max>2.0</max>
394 <precision>0.01</precision>
395+
396 --- a/plugins/ezoom/ezoom.xml.in
397 +++ b/plugins/ezoom/ezoom.xml.in
398 @@ -29,7 +29,6 @@
399@@ -390,6 +393,7 @@
400 </option>
401 </subgroup>
402 </group>
403+
404 --- a/plugins/fade/fade.xml.in
405 +++ b/plugins/fade/fade.xml.in
406 @@ -10,6 +10,7 @@
407@@ -409,6 +413,7 @@
408 </option>
409 <option name="visual_bell" type="bell">
410 <_short>Visual Bell</_short>
411+
412 --- a/plugins/gnomecompat/gnomecompat.xml.in
413 +++ b/plugins/gnomecompat/gnomecompat.xml.in
414 @@ -53,6 +53,7 @@
415@@ -419,6 +424,7 @@
416 </option>
417 </group>
418 </options>
419+
420 --- a/plugins/grid/grid.xml.in
421 +++ b/plugins/grid/grid.xml.in
422 @@ -23,17 +23,16 @@
423@@ -449,6 +455,7 @@
424 </option>
425 <option name="put_restore_key" type="key">
426 <_short>Restore</_short>
427+
428 --- a/plugins/place/place.xml.in
429 +++ b/plugins/place/place.xml.in
430 @@ -20,8 +20,8 @@
431@@ -462,6 +469,7 @@
432 <max>5</max>
433 <desc>
434 <value>0</value>
435+
436 --- a/plugins/resize/resize.xml.in
437 +++ b/plugins/resize/resize.xml.in
438 @@ -28,7 +28,7 @@
439@@ -508,6 +516,7 @@
440 </default>
441 </option>
442 <subgroup>
443+
444 --- a/plugins/scale/scale.xml.in
445 +++ b/plugins/scale/scale.xml.in
446 @@ -19,14 +19,14 @@
447@@ -598,6 +607,7 @@
448 </option>
449 </group>
450 </options>
451+
452 --- a/plugins/staticswitcher/staticswitcher.xml.in
453 +++ b/plugins/staticswitcher/staticswitcher.xml.in
454 @@ -11,7 +11,6 @@
455@@ -676,6 +686,7 @@
456 <desc>
457 <value>0</value>
458 <_name>None</_name>
459+
460 --- a/plugins/vpswitch/vpswitch.xml.in
461 +++ b/plugins/vpswitch/vpswitch.xml.in
462 @@ -95,13 +95,11 @@
463@@ -692,6 +703,7 @@
464 <internal/>
465 </option>
466 <option name="initiate_button" type="button">
467+
468 --- a/plugins/wall/wall.xml.in
469 +++ b/plugins/wall/wall.xml.in
470 @@ -31,12 +31,12 @@
471@@ -841,3 +853,15 @@
472 </option>
473 <option name="edgeflip_dnd" type="bool">
474 <_short>Edge Flip DnD</_short>
475+
476+--- a/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp
477++++ b/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp
478+@@ -46,7 +46,7 @@
479+
480+ namespace
481+ {
482+-unsigned int DEFAULT_VIEWPORT_WIDTH = 4;
483++unsigned int DEFAULT_VIEWPORT_WIDTH = 1;
484+ unsigned int DEFAULT_VIEWPORT_HEIGHT = 1;
485+
486+ bool Advance (Display *d, bool r)
487
488=== modified file 'tests/system/xorg-gtest/CMakeLists.txt'
489--- tests/system/xorg-gtest/CMakeLists.txt 2012-11-28 14:33:20 +0000
490+++ tests/system/xorg-gtest/CMakeLists.txt 2013-02-15 06:26:25 +0000
491@@ -1,33 +1,5 @@
492-include (FindPkgConfig)
493-
494-pkg_check_modules (XORG_SERVER xorg-gtest xorg-server x11)
495-
496-option (BUILD_XORG_GTEST "Build Xorg GTest integration tests" OFF)
497-
498-if (XORG_SERVER_FOUND AND BUILD_XORG_GTEST)
499-
500- execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=prefix xorg-gtest OUTPUT_VARIABLE _xorg_gtest_prefix)
501- execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=includedir xorg-gtest OUTPUT_VARIABLE _xorg_gtest_include_dir)
502- execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=sourcedir xorg-gtest OUTPUT_VARIABLE _xorg_gtest_source_dir)
503- execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=CPPflags xorg-gtest OUTPUT_VARIABLE _xorg_gtest_cflags)
504-
505- string (STRIP ${_xorg_gtest_prefix} _xorg_gtest_prefix)
506- string (STRIP ${_xorg_gtest_include_dir} _xorg_gtest_include_dir)
507- string (STRIP ${_xorg_gtest_source_dir} _xorg_gtest_source_dir)
508- string (STRIP ${_xorg_gtest_cflags} _xorg_gtest_cflags)
509-
510- set (XORG_SERVER_INCLUDE_XORG_GTEST ${_xorg_gtest_include_dir} CACHE PATH "Path to Xorg GTest Headers")
511- set (XORG_SERVER_GTEST_SRC ${_xorg_gtest_source_dir} CACHE PATH "Path to Xorg GTest Sources")
512- set (COMPIZ_XORG_SYSTEM_TEST_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include CACHE PATH "Path to Compiz Xorg GTest Headers")
513-
514- message (STATUS "Found xorg-gtest sources at " ${XORG_SERVER_GTEST_SRC})
515-
516- add_subdirectory (src)
517+if (BUILD_XORG_GTEST)
518+
519 add_subdirectory (tests)
520
521-else (XORG_SERVER_FOUND AND BUILD_XORG_GTEST)
522-
523- message (WARNING "Could not found xorg-gtest, not building system tests")
524- set (BUILD_XORG_GTEST OFF)
525-
526-endif (XORG_SERVER_FOUND AND BUILD_XORG_GTEST)
527+endif (BUILD_XORG_GTEST)
528
529=== added directory 'tests/xorg-gtest'
530=== added file 'tests/xorg-gtest/CMakeLists.txt'
531--- tests/xorg-gtest/CMakeLists.txt 1970-01-01 00:00:00 +0000
532+++ tests/xorg-gtest/CMakeLists.txt 2013-02-15 06:26:25 +0000
533@@ -0,0 +1,49 @@
534+set (COMPIZ_LD_LIBRARY_PATH ${CMAKE_BINARY_DIR}/src CACHE STRING "" FORCE)
535+set (COMPIZ_BINARY ${CMAKE_BINARY_DIR}/src/compiz CACHE STRING "" FORCE)
536+
537+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/src/compiz-xorg-gtest-config.h.in
538+ ${CMAKE_CURRENT_BINARY_DIR}/src/compiz-xorg-gtest-config.h
539+ @ONLY)
540+
541+include_directories (${XORG_SERVER_INCLUDE_XORG_GTEST}
542+ ${XORG_SERVER_GTEST_INCLUDES}
543+ ${COMPIZ_XORG_SYSTEM_TEST_INCLUDE_DIR}
544+ ${CMAKE_CURRENT_BINARY_DIR}/src
545+ ${compiz_SOURCE_DIR}/tests/shared)
546+
547+link_directories (${XORG_SERVER_LIBRARY_DIRS})
548+
549+add_definitions (${XORG_SERVER_GTEST_CFLAGS})
550+
551+set (_xorg_gtest_all_srcs
552+ ${XORG_SERVER_GTEST_SRC}/src/xorg-gtest-all.cpp)
553+
554+set (_xorg_gtest_main_srcs
555+ ${XORG_SERVER_GTEST_SRC}/src/xorg-gtest_main.cpp)
556+
557+add_library (xorg_gtest_all STATIC
558+ ${_xorg_gtest_all_srcs})
559+
560+add_library (xorg_gtest_main STATIC
561+ ${_xorg_gtest_main_srcs})
562+
563+add_library (compiz_xorg_gtest_system_test STATIC
564+ ${CMAKE_CURRENT_SOURCE_DIR}/src/compiz-xorg-gtest.cpp)
565+
566+target_link_libraries (xorg_gtest_all
567+ ${GTEST_BOTH_LIBRARIES}
568+ ${CMAKE_THREAD_LIBS_INIT}
569+ ${XORG_SERVER_GTEST_LIBRARIES})
570+
571+target_link_libraries (xorg_gtest_main
572+ ${GTEST_BOTH_LIBRARIES}
573+ ${CMAKE_THREAD_LIBS_INIT}
574+ ${XORG_SERVER_GTEST_LIBRARIES})
575+
576+target_link_libraries (compiz_xorg_gtest_system_test
577+ xorg_gtest_all
578+ xorg_gtest_main
579+ ${GTEST_BOTH_LIBRARIES}
580+ ${CMAKE_THREAD_LIBS_INIT}
581+ ${XORG_SERVER_LIBRARIES}
582+ ${X11_XI_LIBRARIES})
583
584=== renamed directory 'tests/system/xorg-gtest/include' => 'tests/xorg-gtest/include'
585=== renamed directory 'tests/system/xorg-gtest/src' => 'tests/xorg-gtest/src'
586=== modified file 'tests/xorg-gtest/src/CMakeLists.txt'
587--- tests/system/xorg-gtest/src/CMakeLists.txt 2012-09-18 13:17:09 +0000
588+++ tests/xorg-gtest/src/CMakeLists.txt 2013-02-15 06:26:25 +0000
589@@ -1,51 +0,0 @@
590-set (COMPIZ_LD_LIBRARY_PATH ${CMAKE_BINARY_DIR}/src CACHE STRING "" FORCE)
591-set (COMPIZ_BINARY ${CMAKE_BINARY_DIR}/src/compiz CACHE STRING "" FORCE)
592-
593-configure_file (${CMAKE_CURRENT_SOURCE_DIR}/compiz-xorg-gtest-config.h.in
594- ${CMAKE_CURRENT_BINARY_DIR}/compiz-xorg-gtest-config.h
595- @ONLY)
596-
597-add_definitions (${_xorg_gtest_cflags})
598-
599-include_directories (${COMPIZ_XORG_SYSTEM_TEST_INCLUDE_DIR}
600- ${XORG_SERVER_INCLUDE_DIRS}
601- ${GTEST_INCLUDE_DIRS}
602- ${XORG_SERVER_INCLUDE_XORG_GTEST}
603- ${XORG_SERVER_GTEST_SRC}
604- ${CMAKE_CURRENT_BINARY_DIR})
605-
606-link_directories (${XORG_SERVER_LIBRARY_DIRS})
607-
608-# This actually includes xorg-gtest-all and the defines
609-set (_xorg_gtest_all_srcs
610- ${XORG_SERVER_GTEST_SRC}/src/xorg-gtest-all.cpp)
611-
612-set (_xorg_gtest_main_srcs
613- ${XORG_SERVER_GTEST_SRC}/src/xorg-gtest_main.cpp)
614-
615-add_library (xorg_gtest_all STATIC
616- ${_xorg_gtest_all_srcs})
617-
618-add_library (xorg_gtest_main STATIC
619- ${_xorg_gtest_main_srcs})
620-
621-add_library (compiz_xorg_gtest_system_test STATIC
622- ${CMAKE_CURRENT_SOURCE_DIR}/compiz-xorg-gtest.cpp)
623-
624-target_link_libraries (xorg_gtest_all
625- ${GTEST_BOTH_LIBRARIES}
626- ${CMAKE_THREAD_LIBS_INIT}
627- ${XORG_SERVER_LIBRARIES})
628-
629-target_link_libraries (xorg_gtest_main
630- ${GTEST_BOTH_LIBRARIES}
631- ${CMAKE_THREAD_LIBS_INIT}
632- ${XORG_SERVER_LIBRARIES})
633-
634-target_link_libraries (compiz_xorg_gtest_system_test
635- xorg_gtest_all
636- xorg_gtest_main
637- ${GTEST_BOTH_LIBRARIES}
638- ${CMAKE_THREAD_LIBS_INIT}
639- ${XORG_SERVER_LIBRARIES}
640- ${X11_XI_LIBRARIES})
641
642=== modified file 'tests/xorg-gtest/src/compiz-xorg-gtest.cpp'
643--- tests/system/xorg-gtest/src/compiz-xorg-gtest.cpp 2012-12-05 16:01:37 +0000
644+++ tests/xorg-gtest/src/compiz-xorg-gtest.cpp 2013-02-15 06:26:25 +0000
645@@ -28,6 +28,7 @@
646 #include <boost/shared_ptr.hpp>
647 #include <xorg/gtest/xorg-gtest.h>
648 #include <compiz-xorg-gtest.h>
649+#include <gtest_shared_tmpenv.h>
650 #include <X11/Xlib.h>
651 #include <X11/Xatom.h>
652
653@@ -420,7 +421,13 @@
654 {
655 public:
656
657+ PrivateCompizXorgSystemTest () :
658+ mStdoutEnv ("XORG_GTEST_CHILD_STDOUT", "1")
659+ {
660+ }
661+
662 boost::shared_ptr <ct::CompizProcess> mProcess;
663+ TmpEnv mStdoutEnv;
664 };
665
666 ct::CompizXorgSystemTest::CompizXorgSystemTest () :

Subscribers

People subscribed via source and target branches