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: 792 lines (+407/-125) (has conflicts)
13 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 (+23/-0)
debian/control (+3/-0)
debian/patches/ccp_plugin.patch (+48/-5)
debian/patches/ubuntu-config.patch (+123/-0)
tests/system/xorg-gtest/CMakeLists.txt (+3/-31)
tests/xorg-gtest/CMakeLists.txt (+48/-0)
tests/xorg-gtest/src/CMakeLists.txt (+0/-51)
Text conflict in debian/changelog
Text conflict in debian/patches/ubuntu-config.patch
To merge this branch: bzr merge lp:~compiz-team/compiz/compiz.fix_1120009.3
Reviewer Review Type Date Requested Status
MC Return Pending
Brandon Schaefer Pending
PS Jenkins bot continuous-integration Pending
Review via email: mp+148370@code.launchpad.net

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

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

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 :

(Resubmitted with the correct candidate branch)

lp:~compiz-team/compiz/compiz.fix_1120009.3 updated
3563. By Sam Spilsbury

Merge lp:compiz

3564. By Sam Spilsbury

Merge lp:compiz

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 2012-11-05 20:50:59 +0000
3+++ CMakeLists.txt 2013-02-14 04:57:21 +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-14 04:57:21 +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-14 04:57:21 +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-14 04:57:21 +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-14 04:57:21 +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-14 04:57:21 +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-14 04:57:21 +0000
251@@ -1,3 +1,4 @@
252+<<<<<<< TREE
253 compiz (1:0.9.9~daily13.02.08-0ubuntu1) raring; urgency=low
254
255 [ MC Return ]
256@@ -279,6 +280,28 @@
257
258 -- Automatic PS uploader <ps-jenkins@lists.canonical.com> Fri, 11 Jan 2013 04:03:03 +0000
259
260+=======
261+compiz (1:0.9.9~daily12.12.05-0ubuntu4) raring; urgency=low
262+
263+ * debian/ccp_plugin.patch:
264+ - Also adjust test framework to pass the new option
265+
266+ -- Sam Spilsbury <smspillaz@interpol> Thu, 14 Feb 2013 12:49:11 +0800
267+
268+compiz (1:0.9.9~daily12.12.05-0ubuntu3) raring; urgency=low
269+
270+ * debian/control:
271+ - Add xorg-gtest, xserver-xorg-dev, libxi-dev as build-deps
272+ * debian/ubuntu_config.patch:
273+ - Adjust EWMH test for new value
274+ * debian/ccp_plugin.patch:
275+ - Added new option --no-auto-load-ccp to prevent the ccp
276+ plugin from autoloading. Useful for tests where having
277+ this behaviour just causes problems from unwanted side-effects
278+
279+ -- Sam Spilsbury <smspillaz@gmail.com> Thu, 14 Feb 2013 12:45:17 +0800
280+
281+>>>>>>> MERGE-SOURCE
282 compiz (1:0.9.9~daily12.12.05-0ubuntu2) raring; urgency=low
283
284 * Backport a tentative fix from rev 3387 for LP: #1060327
285
286=== modified file 'debian/control'
287--- debian/control 2012-11-05 21:35:41 +0000
288+++ debian/control 2013-02-14 04:57:21 +0000
289@@ -34,8 +34,10 @@
290 libxext-dev,
291 libxdamage-dev (>=1:1.0.3),
292 libxfixes-dev (>= 1:4.0.1),
293+ libxi-dev,
294 libxinerama-dev,
295 libxml-parser-perl,
296+ libxorg-gtest-dev,
297 libxrandr-dev (>= 2:1.1.0.2),
298 libxrender-dev (>= 1:0.9.1),
299 libxcursor-dev,
300@@ -54,6 +56,7 @@
301 python-pyrex,
302 gnome-control-center-dev,
303 gsettings-desktop-schemas-dev,
304+ xserver-xorg-dev (>= 0.7.0),
305 Standards-Version: 3.9.3
306 # If you aren't a member of ~compiz-team but need to upload packaging changes,
307 # just go ahead. ~compiz-team will notice and sync up the code again.
308
309=== modified file 'debian/patches/ccp_plugin.patch'
310--- debian/patches/ccp_plugin.patch 2012-06-19 11:22:48 +0000
311+++ debian/patches/ccp_plugin.patch 2013-02-14 04:57:21 +0000
312@@ -1,8 +1,39 @@
313-Index: compiz-0.9.8/src/main.cpp
314+Index: compiz.fix_1120009/src/main.cpp
315 ===================================================================
316---- compiz-0.9.8.orig/src/main.cpp 2012-05-29 12:09:56.000000000 +0200
317-+++ compiz-0.9.8/src/main.cpp 2012-05-30 16:29:24.940570174 +0200
318-@@ -146,23 +146,25 @@
319+--- compiz.fix_1120009.orig/src/main.cpp 2013-02-14 12:48:07.439747312 +0800
320++++ compiz.fix_1120009/src/main.cpp 2013-02-14 12:48:07.439747312 +0800
321+@@ -38,6 +38,11 @@
322+ #include "privatescreen.h"
323+ #include "privatestackdebugger.h"
324+
325++namespace
326++{
327++bool autoAddCCP = true;
328++}
329++
330+ void
331+ CompManager::usage ()
332+ {
333+@@ -52,6 +57,7 @@
334+ " --debug Enable debug mode\n"
335+ " --version Show the program version\n"
336+ " --help Show this summary\n"
337++ " --no-auto-add-ccp Do not automatically load the ccp plugin\n"
338+ , programName);
339+ }
340+
341+@@ -116,6 +122,10 @@
342+ if (i + 1 < argc)
343+ clientId = argv[++i];
344+ }
345++ else if (!strcmp (argv[i], "--no-auto-add-ccp"))
346++ {
347++ autoAddCCP = false;
348++ }
349+ else if (*argv[i] == '-')
350+ {
351+ compLogMessage ("core", CompLogLevelWarn,
352+@@ -151,23 +161,25 @@
353
354 modHandler = new ModifierHandler ();
355
356@@ -22,7 +53,7 @@
357 list.push_back (value);
358 }
359 + }
360-+ else
361++ else if (autoAddCCP)
362 + list.push_back ("ccp");
363
364 value.set (CompOption::TypeString, list);
365@@ -33,3 +64,15 @@
366
367 if (!screen->init (displayName))
368 return false;
369+Index: compiz.fix_1120009/tests/xorg-gtest/src/compiz-xorg-gtest.cpp
370+===================================================================
371+--- compiz.fix_1120009.orig/tests/xorg-gtest/src/compiz-xorg-gtest.cpp 2013-02-14 12:40:34.298043000 +0800
372++++ compiz.fix_1120009/tests/xorg-gtest/src/compiz-xorg-gtest.cpp 2013-02-14 12:48:58.900002488 +0800
373+@@ -389,6 +389,7 @@
374+ if (flags & ct::CompizProcess::ReplaceCurrentWM)
375+ args.push_back ("--replace");
376+
377++ args.push_back ("--no-auto-add-ccp");
378+ args.push_back ("--send-startup-message");
379+
380+ priv->mProcess.Start (compizBinaryPath, args);
381
382=== modified file 'debian/patches/ubuntu-config.patch'
383--- debian/patches/ubuntu-config.patch 2013-02-01 19:03:51 +0000
384+++ debian/patches/ubuntu-config.patch 2013-02-14 04:57:21 +0000
385@@ -1,6 +1,13 @@
386 === modified file 'metadata/core.xml.in'
387+<<<<<<< TREE
388 --- a/metadata/core.xml.in
389 +++ b/metadata/core.xml.in
390+=======
391+Index: compiz.fix_1120009/metadata/core.xml.in
392+===================================================================
393+--- compiz.fix_1120009.orig/metadata/core.xml.in 2013-02-14 12:40:51.101583627 +0800
394++++ compiz.fix_1120009/metadata/core.xml.in 2013-02-14 12:40:51.061583436 +0800
395+>>>>>>> MERGE-SOURCE
396 @@ -139,7 +139,7 @@
397 <option name="focus_prevention_match" type="match">
398 <_short>Focus Prevention Windows</_short>
399@@ -60,12 +67,31 @@
400 <_short>Horizontal Virtual Size</_short>
401 <_long>Screen size multiplier for horizontal virtual size</_long>
402 - <default>4</default>
403+<<<<<<< TREE
404 + <default>1</default>
405 <min>1</min>
406 <max>32</max>
407 </option>
408 --- a/plugins/animation/animation.xml.in
409 +++ b/plugins/animation/animation.xml.in
410+=======
411++ <default>2</default>
412+ <min>1</min>
413+ <max>32</max>
414+ </option>
415+ <option name="vsize" type="int">
416+ <_short>Vertical Virtual Size</_short>
417+ <_long>Screen size multiplier for vertical virtual size</_long>
418+- <default>1</default>
419++ <default>2</default>
420+ <min>1</min>
421+ <max>32</max>
422+ </option>
423+Index: compiz.fix_1120009/plugins/animation/animation.xml.in
424+===================================================================
425+--- compiz.fix_1120009.orig/plugins/animation/animation.xml.in 2013-02-14 12:40:51.101583627 +0800
426++++ compiz.fix_1120009/plugins/animation/animation.xml.in 2013-02-14 12:40:51.061583436 +0800
427+>>>>>>> MERGE-SOURCE
428 @@ -36,7 +36,7 @@
429 <extensible/>
430 <sort start="2"/>
431@@ -204,8 +230,15 @@
432 <min>0</min>
433 <max>1</max>
434 <precision>0.01</precision>
435+<<<<<<< TREE
436 --- a/plugins/decor/decor.xml.in
437 +++ b/plugins/decor/decor.xml.in
438+=======
439+Index: compiz.fix_1120009/plugins/decor/decor.xml.in
440+===================================================================
441+--- compiz.fix_1120009.orig/plugins/decor/decor.xml.in 2013-02-14 12:40:51.101583627 +0800
442++++ compiz.fix_1120009/plugins/decor/decor.xml.in 2013-02-14 12:40:51.061583436 +0800
443+>>>>>>> MERGE-SOURCE
444 @@ -31,7 +31,7 @@
445 <option name="active_shadow_opacity" type="float">
446 <_short>Shadow Opacity</_short>
447@@ -242,8 +275,15 @@
448 </option>
449 <option name="mipmap" type="bool">
450 <_short>Mipmap</_short>
451+<<<<<<< TREE
452 --- a/plugins/expo/expo.xml.in
453 +++ b/plugins/expo/expo.xml.in
454+=======
455+Index: compiz.fix_1120009/plugins/expo/expo.xml.in
456+===================================================================
457+--- compiz.fix_1120009.orig/plugins/expo/expo.xml.in 2013-02-14 12:40:51.101583627 +0800
458++++ compiz.fix_1120009/plugins/expo/expo.xml.in 2013-02-14 12:40:51.061583436 +0800
459+>>>>>>> MERGE-SOURCE
460 @@ -17,6 +17,7 @@
461 <plugin>wobbly</plugin>
462 <plugin>animation</plugin>
463@@ -355,8 +395,15 @@
464 <min>0.0</min>
465 <max>2.0</max>
466 <precision>0.01</precision>
467+<<<<<<< TREE
468 --- a/plugins/ezoom/ezoom.xml.in
469 +++ b/plugins/ezoom/ezoom.xml.in
470+=======
471+Index: compiz.fix_1120009/plugins/ezoom/ezoom.xml.in
472+===================================================================
473+--- compiz.fix_1120009.orig/plugins/ezoom/ezoom.xml.in 2013-02-14 12:40:51.101583627 +0800
474++++ compiz.fix_1120009/plugins/ezoom/ezoom.xml.in 2013-02-14 12:40:51.061583436 +0800
475+>>>>>>> MERGE-SOURCE
476 @@ -29,7 +29,6 @@
477 <option type="button" name="zoom_in_button">
478 <_short>Zoom In</_short>
479@@ -390,8 +437,15 @@
480 </option>
481 </subgroup>
482 </group>
483+<<<<<<< TREE
484 --- a/plugins/fade/fade.xml.in
485 +++ b/plugins/fade/fade.xml.in
486+=======
487+Index: compiz.fix_1120009/plugins/fade/fade.xml.in
488+===================================================================
489+--- compiz.fix_1120009.orig/plugins/fade/fade.xml.in 2013-02-14 12:40:51.101583627 +0800
490++++ compiz.fix_1120009/plugins/fade/fade.xml.in 2013-02-14 12:40:51.061583436 +0800
491+>>>>>>> MERGE-SOURCE
492 @@ -10,6 +10,7 @@
493 </requirement>
494 <relation type="after">
495@@ -409,8 +463,15 @@
496 </option>
497 <option name="visual_bell" type="bell">
498 <_short>Visual Bell</_short>
499+<<<<<<< TREE
500 --- a/plugins/gnomecompat/gnomecompat.xml.in
501 +++ b/plugins/gnomecompat/gnomecompat.xml.in
502+=======
503+Index: compiz.fix_1120009/plugins/gnomecompat/gnomecompat.xml.in
504+===================================================================
505+--- compiz.fix_1120009.orig/plugins/gnomecompat/gnomecompat.xml.in 2013-02-14 12:40:51.101583627 +0800
506++++ compiz.fix_1120009/plugins/gnomecompat/gnomecompat.xml.in 2013-02-14 12:40:51.061583436 +0800
507+>>>>>>> MERGE-SOURCE
508 @@ -53,6 +53,7 @@
509 <option name="run_command_terminal_key" type="key">
510 <_short>Open a terminal</_short>
511@@ -419,8 +480,15 @@
512 </option>
513 </group>
514 </options>
515+<<<<<<< TREE
516 --- a/plugins/grid/grid.xml.in
517 +++ b/plugins/grid/grid.xml.in
518+=======
519+Index: compiz.fix_1120009/plugins/grid/grid.xml.in
520+===================================================================
521+--- compiz.fix_1120009.orig/plugins/grid/grid.xml.in 2013-02-14 12:40:51.101583627 +0800
522++++ compiz.fix_1120009/plugins/grid/grid.xml.in 2013-02-14 12:40:51.065583451 +0800
523+>>>>>>> MERGE-SOURCE
524 @@ -23,17 +23,16 @@
525 <option name="put_center_key" type="key">
526 <_short>Put Center</_short>
527@@ -449,8 +517,15 @@
528 </option>
529 <option name="put_restore_key" type="key">
530 <_short>Restore</_short>
531+<<<<<<< TREE
532 --- a/plugins/place/place.xml.in
533 +++ b/plugins/place/place.xml.in
534+=======
535+Index: compiz.fix_1120009/plugins/place/place.xml.in
536+===================================================================
537+--- compiz.fix_1120009.orig/plugins/place/place.xml.in 2013-02-14 12:40:51.101583627 +0800
538++++ compiz.fix_1120009/plugins/place/place.xml.in 2013-02-14 12:40:51.065583451 +0800
539+>>>>>>> MERGE-SOURCE
540 @@ -20,8 +20,8 @@
541 <option name="mode" type="int">
542 <_short>Placement Mode</_short>
543@@ -462,8 +537,15 @@
544 <max>5</max>
545 <desc>
546 <value>0</value>
547+<<<<<<< TREE
548 --- a/plugins/resize/resize.xml.in
549 +++ b/plugins/resize/resize.xml.in
550+=======
551+Index: compiz.fix_1120009/plugins/resize/resize.xml.in
552+===================================================================
553+--- compiz.fix_1120009.orig/plugins/resize/resize.xml.in 2013-02-14 12:40:51.101583627 +0800
554++++ compiz.fix_1120009/plugins/resize/resize.xml.in 2013-02-14 12:40:51.065583451 +0800
555+>>>>>>> MERGE-SOURCE
556 @@ -28,7 +28,7 @@
557 <option name="mode" type="int">
558 <_short>Default Resize Mode</_short>
559@@ -508,8 +590,15 @@
560 </default>
561 </option>
562 <subgroup>
563+<<<<<<< TREE
564 --- a/plugins/scale/scale.xml.in
565 +++ b/plugins/scale/scale.xml.in
566+=======
567+Index: compiz.fix_1120009/plugins/scale/scale.xml.in
568+===================================================================
569+--- compiz.fix_1120009.orig/plugins/scale/scale.xml.in 2013-02-14 12:40:51.101583627 +0800
570++++ compiz.fix_1120009/plugins/scale/scale.xml.in 2013-02-14 12:40:51.065583451 +0800
571+>>>>>>> MERGE-SOURCE
572 @@ -19,14 +19,14 @@
573 <option name="spacing" type="int">
574 <_short>Spacing</_short>
575@@ -598,8 +687,15 @@
576 </option>
577 </group>
578 </options>
579+<<<<<<< TREE
580 --- a/plugins/staticswitcher/staticswitcher.xml.in
581 +++ b/plugins/staticswitcher/staticswitcher.xml.in
582+=======
583+Index: compiz.fix_1120009/plugins/staticswitcher/staticswitcher.xml.in
584+===================================================================
585+--- compiz.fix_1120009.orig/plugins/staticswitcher/staticswitcher.xml.in 2013-02-14 12:40:51.101583627 +0800
586++++ compiz.fix_1120009/plugins/staticswitcher/staticswitcher.xml.in 2013-02-14 12:40:51.065583451 +0800
587+>>>>>>> MERGE-SOURCE
588 @@ -11,7 +11,6 @@
589 <relation type="after">
590 <plugin>composite</plugin>
591@@ -676,8 +772,15 @@
592 <desc>
593 <value>0</value>
594 <_name>None</_name>
595+<<<<<<< TREE
596 --- a/plugins/vpswitch/vpswitch.xml.in
597 +++ b/plugins/vpswitch/vpswitch.xml.in
598+=======
599+Index: compiz.fix_1120009/plugins/vpswitch/vpswitch.xml.in
600+===================================================================
601+--- compiz.fix_1120009.orig/plugins/vpswitch/vpswitch.xml.in 2013-02-14 12:40:51.101583627 +0800
602++++ compiz.fix_1120009/plugins/vpswitch/vpswitch.xml.in 2013-02-14 12:40:51.065583451 +0800
603+>>>>>>> MERGE-SOURCE
604 @@ -95,13 +95,11 @@
605 <option name="next_button" type="button">
606 <_short>Move Next</_short>
607@@ -692,8 +795,15 @@
608 <internal/>
609 </option>
610 <option name="initiate_button" type="button">
611+<<<<<<< TREE
612 --- a/plugins/wall/wall.xml.in
613 +++ b/plugins/wall/wall.xml.in
614+=======
615+Index: compiz.fix_1120009/plugins/wall/wall.xml.in
616+===================================================================
617+--- compiz.fix_1120009.orig/plugins/wall/wall.xml.in 2013-02-14 12:40:51.101583627 +0800
618++++ compiz.fix_1120009/plugins/wall/wall.xml.in 2013-02-14 12:40:51.065583451 +0800
619+>>>>>>> MERGE-SOURCE
620 @@ -31,12 +31,12 @@
621 <option name="miniscreen" type="bool">
622 <_short>Show Live Viewport Previews</_short>
623@@ -841,3 +951,16 @@
624 </option>
625 <option name="edgeflip_dnd" type="bool">
626 <_short>Edge Flip DnD</_short>
627+Index: compiz.fix_1120009/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp
628+===================================================================
629+--- compiz.fix_1120009.orig/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp 2013-02-10 12:56:08.078356000 +0800
630++++ compiz.fix_1120009/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp 2013-02-14 12:41:35.665804612 +0800
631+@@ -46,7 +46,7 @@
632+
633+ namespace
634+ {
635+-unsigned int DEFAULT_VIEWPORT_WIDTH = 4;
636++unsigned int DEFAULT_VIEWPORT_WIDTH = 1;
637+ unsigned int DEFAULT_VIEWPORT_HEIGHT = 1;
638+
639+ bool Advance (Display *d, bool r)
640
641=== modified file 'tests/system/xorg-gtest/CMakeLists.txt'
642--- tests/system/xorg-gtest/CMakeLists.txt 2012-11-28 14:33:20 +0000
643+++ tests/system/xorg-gtest/CMakeLists.txt 2013-02-14 04:57:21 +0000
644@@ -1,33 +1,5 @@
645-include (FindPkgConfig)
646-
647-pkg_check_modules (XORG_SERVER xorg-gtest xorg-server x11)
648-
649-option (BUILD_XORG_GTEST "Build Xorg GTest integration tests" OFF)
650-
651-if (XORG_SERVER_FOUND AND BUILD_XORG_GTEST)
652-
653- execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=prefix xorg-gtest OUTPUT_VARIABLE _xorg_gtest_prefix)
654- execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=includedir xorg-gtest OUTPUT_VARIABLE _xorg_gtest_include_dir)
655- execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=sourcedir xorg-gtest OUTPUT_VARIABLE _xorg_gtest_source_dir)
656- execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=CPPflags xorg-gtest OUTPUT_VARIABLE _xorg_gtest_cflags)
657-
658- string (STRIP ${_xorg_gtest_prefix} _xorg_gtest_prefix)
659- string (STRIP ${_xorg_gtest_include_dir} _xorg_gtest_include_dir)
660- string (STRIP ${_xorg_gtest_source_dir} _xorg_gtest_source_dir)
661- string (STRIP ${_xorg_gtest_cflags} _xorg_gtest_cflags)
662-
663- set (XORG_SERVER_INCLUDE_XORG_GTEST ${_xorg_gtest_include_dir} CACHE PATH "Path to Xorg GTest Headers")
664- set (XORG_SERVER_GTEST_SRC ${_xorg_gtest_source_dir} CACHE PATH "Path to Xorg GTest Sources")
665- set (COMPIZ_XORG_SYSTEM_TEST_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include CACHE PATH "Path to Compiz Xorg GTest Headers")
666-
667- message (STATUS "Found xorg-gtest sources at " ${XORG_SERVER_GTEST_SRC})
668-
669- add_subdirectory (src)
670+if (BUILD_XORG_GTEST)
671+
672 add_subdirectory (tests)
673
674-else (XORG_SERVER_FOUND AND BUILD_XORG_GTEST)
675-
676- message (WARNING "Could not found xorg-gtest, not building system tests")
677- set (BUILD_XORG_GTEST OFF)
678-
679-endif (XORG_SERVER_FOUND AND BUILD_XORG_GTEST)
680+endif (BUILD_XORG_GTEST)
681
682=== added directory 'tests/xorg-gtest'
683=== added file 'tests/xorg-gtest/CMakeLists.txt'
684--- tests/xorg-gtest/CMakeLists.txt 1970-01-01 00:00:00 +0000
685+++ tests/xorg-gtest/CMakeLists.txt 2013-02-14 04:57:21 +0000
686@@ -0,0 +1,48 @@
687+set (COMPIZ_LD_LIBRARY_PATH ${CMAKE_BINARY_DIR}/src CACHE STRING "" FORCE)
688+set (COMPIZ_BINARY ${CMAKE_BINARY_DIR}/src/compiz CACHE STRING "" FORCE)
689+
690+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/src/compiz-xorg-gtest-config.h.in
691+ ${CMAKE_CURRENT_BINARY_DIR}/src/compiz-xorg-gtest-config.h
692+ @ONLY)
693+
694+include_directories (${XORG_SERVER_INCLUDE_XORG_GTEST}
695+ ${XORG_SERVER_GTEST_INCLUDES}
696+ ${COMPIZ_XORG_SYSTEM_TEST_INCLUDE_DIR}
697+ ${CMAKE_CURRENT_BINARY_DIR}/src)
698+
699+link_directories (${XORG_SERVER_LIBRARY_DIRS})
700+
701+add_definitions (${XORG_SERVER_GTEST_CFLAGS})
702+
703+set (_xorg_gtest_all_srcs
704+ ${XORG_SERVER_GTEST_SRC}/src/xorg-gtest-all.cpp)
705+
706+set (_xorg_gtest_main_srcs
707+ ${XORG_SERVER_GTEST_SRC}/src/xorg-gtest_main.cpp)
708+
709+add_library (xorg_gtest_all STATIC
710+ ${_xorg_gtest_all_srcs})
711+
712+add_library (xorg_gtest_main STATIC
713+ ${_xorg_gtest_main_srcs})
714+
715+add_library (compiz_xorg_gtest_system_test STATIC
716+ ${CMAKE_CURRENT_SOURCE_DIR}/src/compiz-xorg-gtest.cpp)
717+
718+target_link_libraries (xorg_gtest_all
719+ ${GTEST_BOTH_LIBRARIES}
720+ ${CMAKE_THREAD_LIBS_INIT}
721+ ${XORG_SERVER_GTEST_LIBRARIES})
722+
723+target_link_libraries (xorg_gtest_main
724+ ${GTEST_BOTH_LIBRARIES}
725+ ${CMAKE_THREAD_LIBS_INIT}
726+ ${XORG_SERVER_GTEST_LIBRARIES})
727+
728+target_link_libraries (compiz_xorg_gtest_system_test
729+ xorg_gtest_all
730+ xorg_gtest_main
731+ ${GTEST_BOTH_LIBRARIES}
732+ ${CMAKE_THREAD_LIBS_INIT}
733+ ${XORG_SERVER_LIBRARIES}
734+ ${X11_XI_LIBRARIES})
735
736=== renamed directory 'tests/system/xorg-gtest/include' => 'tests/xorg-gtest/include'
737=== renamed directory 'tests/system/xorg-gtest/src' => 'tests/xorg-gtest/src'
738=== modified file 'tests/xorg-gtest/src/CMakeLists.txt'
739--- tests/system/xorg-gtest/src/CMakeLists.txt 2012-09-18 13:17:09 +0000
740+++ tests/xorg-gtest/src/CMakeLists.txt 2013-02-14 04:57:21 +0000
741@@ -1,51 +0,0 @@
742-set (COMPIZ_LD_LIBRARY_PATH ${CMAKE_BINARY_DIR}/src CACHE STRING "" FORCE)
743-set (COMPIZ_BINARY ${CMAKE_BINARY_DIR}/src/compiz CACHE STRING "" FORCE)
744-
745-configure_file (${CMAKE_CURRENT_SOURCE_DIR}/compiz-xorg-gtest-config.h.in
746- ${CMAKE_CURRENT_BINARY_DIR}/compiz-xorg-gtest-config.h
747- @ONLY)
748-
749-add_definitions (${_xorg_gtest_cflags})
750-
751-include_directories (${COMPIZ_XORG_SYSTEM_TEST_INCLUDE_DIR}
752- ${XORG_SERVER_INCLUDE_DIRS}
753- ${GTEST_INCLUDE_DIRS}
754- ${XORG_SERVER_INCLUDE_XORG_GTEST}
755- ${XORG_SERVER_GTEST_SRC}
756- ${CMAKE_CURRENT_BINARY_DIR})
757-
758-link_directories (${XORG_SERVER_LIBRARY_DIRS})
759-
760-# This actually includes xorg-gtest-all and the defines
761-set (_xorg_gtest_all_srcs
762- ${XORG_SERVER_GTEST_SRC}/src/xorg-gtest-all.cpp)
763-
764-set (_xorg_gtest_main_srcs
765- ${XORG_SERVER_GTEST_SRC}/src/xorg-gtest_main.cpp)
766-
767-add_library (xorg_gtest_all STATIC
768- ${_xorg_gtest_all_srcs})
769-
770-add_library (xorg_gtest_main STATIC
771- ${_xorg_gtest_main_srcs})
772-
773-add_library (compiz_xorg_gtest_system_test STATIC
774- ${CMAKE_CURRENT_SOURCE_DIR}/compiz-xorg-gtest.cpp)
775-
776-target_link_libraries (xorg_gtest_all
777- ${GTEST_BOTH_LIBRARIES}
778- ${CMAKE_THREAD_LIBS_INIT}
779- ${XORG_SERVER_LIBRARIES})
780-
781-target_link_libraries (xorg_gtest_main
782- ${GTEST_BOTH_LIBRARIES}
783- ${CMAKE_THREAD_LIBS_INIT}
784- ${XORG_SERVER_LIBRARIES})
785-
786-target_link_libraries (compiz_xorg_gtest_system_test
787- xorg_gtest_all
788- xorg_gtest_main
789- ${GTEST_BOTH_LIBRARIES}
790- ${CMAKE_THREAD_LIBS_INIT}
791- ${XORG_SERVER_LIBRARIES}
792- ${X11_XI_LIBRARIES})

Subscribers

People subscribed via source and target branches