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

[Sam Spilsbury]

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/

(LP: #1120009)

Don't merge yet.

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/

(LP: #1120009)

[MC Return (mc-return)]

More useful tests can only be good.

review: Approve

[PS Jenkins bot (ps-jenkins)]

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)

[PS Jenkins bot (ps-jenkins)]

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)

[PS Jenkins bot (ps-jenkins)]

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)

[Brandon Schaefer (brandontschaefer)]

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

review: Approve

[PS Jenkins bot (ps-jenkins)]

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)

[Sam Spilsbury (smspillaz)]

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

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

[Sam Spilsbury (smspillaz)]

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.

[PS Jenkins bot (ps-jenkins)]

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)

[Sam Spilsbury (smspillaz)]

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

[PS Jenkins bot (ps-jenkins)]

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)

[lp:~compiz-team/compiz/compiz.fix_1120009.3.debug]

3562. By Sam Spilsbury on 2013-02-14

More debugging and disable problematic patches

[PS Jenkins bot (ps-jenkins)]

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)

Unmerged revisions

3562. By Sam Spilsbury on 2013-02-14

More debugging and disable problematic patches

3561. By Sam Spilsbury on 2013-02-13

Some debugging info

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-11-05 20:50:59 +0000
+++ CMakeLists.txt	2013-02-14 02:19:20 +0000
@@ -22,6 +22,10 @@
 # GSettings schema recompilation
 include (CompizGSettings)
 
+# Google Test and Xorg-GTest
+include (GoogleTest)
+include (XorgGTest)
+
 include (cmake/base.cmake)
 # Check if specific function is present in library.
 include (CheckFunctionExists)
@@ -137,45 +141,38 @@
 
 if (COMPIZ_BUILD_TESTING)
 
-    # Build Google Test and make its headers known
-    find_package (GTest)
-
-    if (NOT GTEST_FOUND)
-
-	# Check for google test and build it locally
-	set (GTEST_ROOT_DIR
-	     "/usr/src/gtest" # Default value, adjustable by user with e.g., ccmake
-	     CACHE
-	     PATH
-	     "Path to Google Test srcs"
-	     FORCE
-	)
-
-	find_path (GTEST_INCLUDE_DIR gtest/gtest.h)
-
-	if (GTEST_INCLUDE_DIR)
-	    add_subdirectory (${GTEST_ROOT_DIR}
-			     gtest)
-	endif (GTEST_INCLUDE_DIR)
-
-	set (GTEST_BOTH_LIBRARIES gtest gtest_main)
-	set (GTEST_FOUND TRUE)
-
-    endif (NOT GTEST_FOUND)
-
-    find_library (GMOCK_LIBRARY gmock)
-    find_library (GMOCK_MAIN_LIBRARY gmock_main)
-
-    if (NOT GMOCK_LIBRARY OR NOT GMOCK_MAIN_LIBRARY OR NOT GTEST_FOUND)
-
-	message ("Google Mock and Google Test not found - cannot build tests!")
+    find_package (GoogleTest)
+
+    if (GOOGLE_TEST_AND_MOCK_FOUND)
+
+	build_google_test_locally (${CMAKE_BINARY_DIR}/__gtest)
+
+	if (BUILD_XORG_GTEST)
+
+	    find_package (XorgGTest)
+
+	    if (XORG_GTEST_FOUND)
+
+		build_xorg_gtest_locally (${CMAKE_BINARY_DIR}/__xorg_gtest)
+
+	    else (XORG_GTEST_FOUND)
+
+		set (BUILD_XORG_GTEST FALSE)
+
+	    endif (XORG_GTEST_FOUND)
+
+	endif (BUILD_XORG_GTEST)
+
+    else (GOOGLE_TEST_AND_MOCK_FOUND)
+
 	set (COMPIZ_BUILD_TESTING OFF CACHE BOOL "" FORCE)
-
-    else (NOT GMOCK_LIBRARY OR NOT GMOCK_MAIN_LIBRARY OR NOT GTEST_FOUND)
-
-	include_directories (${GTEST_INCLUDE_DIRS})
-
-    endif (NOT GMOCK_LIBRARY OR NOT GMOCK_MAIN_LIBRARY OR NOT GTEST_FOUND)
+	set (BUILD_XORG_GTEST OFF CACHE BOOL "" FORCE)
+
+    endif (GOOGLE_TEST_AND_MOCK_FOUND)
+
+else (COMPIZ_BUILD_TESTING)
+
+    set (BUILD_XORG_GTEST OFF CACHE BOOL "" FORCE)
 
 endif (COMPIZ_BUILD_TESTING)
 

=== modified file 'cmake/CompizCommon.cmake'
--- cmake/CompizCommon.cmake	2013-01-04 04:46:01 +0000
+++ cmake/CompizCommon.cmake	2013-02-14 02:19:20 +0000
@@ -31,6 +31,7 @@
 option (COMPIZ_RUN_LDCONFIG "Leave OFF unless you need to run ldconfig after install")
 option (COMPIZ_PACKAGING_ENABLED "Enable to manually set prefix, exec_prefix, libdir, includedir, datadir" OFF)
 option (COMPIZ_BUILD_TESTING "Build Unit Tests" ON)
+option (BUILD_XORG_GTEST "Build Xorg GTest integration tests" ON)
 
 set (COMPIZ_DATADIR ${CMAKE_INSTALL_PREFIX}/share)
 set (COMPIZ_METADATADIR ${CMAKE_INSTALL_PREFIX}/share/compiz)

=== added file 'cmake/FindGoogleTest.cmake'
--- cmake/FindGoogleTest.cmake	1970-01-01 00:00:00 +0000
+++ cmake/FindGoogleTest.cmake	2013-02-14 02:19:20 +0000
@@ -0,0 +1,46 @@
+# Find Google Test and Google Mock, either with pkg-config or by
+# searching the system install paths. This sets:
+#
+# GOOGLE_TEST_AND_MOCK_FOUND
+# GTEST_INCLUDE_DIR
+# GTEST_ROOT_DIR
+# GMOCK_LIBRARY
+# GMOCK_MAIN_LIBRARY
+
+find_package (GTest)
+
+if (NOT GTEST_FOUND)
+
+    # Check for google test and build it locally
+    set (GTEST_ROOT_DIR
+ 	 "/usr/src/gtest" # Default value, adjustable by user with e.g., ccmake
+	 CACHE
+	 PATH
+	 "Path to Google Test srcs"
+	 FORCE)
+
+    find_path (GTEST_INCLUDE_DIR gtest/gtest.h)
+
+    set (GTEST_BOTH_LIBRARIES gtest gtest_main)
+    set (GTEST_FOUND TRUE)
+    set (GTEST_LOCAL_BUILD_REQUIRED TRUE)
+
+else (NOT GTEST_FOUND)
+
+    set (GTEST_LOCAL_BUILD_REQUIRED FALSE)
+
+endif (NOT GTEST_FOUND)
+
+find_library (GMOCK_LIBRARY gmock)
+find_library (GMOCK_MAIN_LIBRARY gmock_main)
+
+if (NOT GMOCK_LIBRARY OR NOT GMOCK_MAIN_LIBRARY OR NOT GTEST_FOUND)
+
+    message ("Google Mock and Google Test not found - cannot build tests!")
+    set (GOOGLE_TEST_AND_MOCK_FOUND OFF CACHE BOOL "" FORCE)
+
+else (NOT GMOCK_LIBRARY OR NOT GMOCK_MAIN_LIBRARY OR NOT GTEST_FOUND)
+
+    set (GOOGLE_TEST_AND_MOCK_FOUND ON CACHE BOOL "" FORCE)
+
+endif (NOT GMOCK_LIBRARY OR NOT GMOCK_MAIN_LIBRARY OR NOT GTEST_FOUND)

=== added file 'cmake/FindXorgGTest.cmake'
--- cmake/FindXorgGTest.cmake	1970-01-01 00:00:00 +0000
+++ cmake/FindXorgGTest.cmake	2013-02-14 02:19:20 +0000
@@ -0,0 +1,43 @@
+# Find xorg-gtest,with pkg-config. This sets:
+#
+# XORG_GTEST_FOUND
+# XORG_SERVER_INCLUDE_XORG_GTEST
+# XORG_SERVER_GTEST_SRC
+
+# xorg-gtest
+pkg_check_modules (XORG_SERVER
+		   xorg-gtest>=0.7.0
+		   xorg-server
+		   x11
+		   xi)
+
+if (XORG_SERVER_FOUND)
+
+    execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=prefix xorg-gtest OUTPUT_VARIABLE _xorg_gtest_prefix)
+    execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=includedir xorg-gtest OUTPUT_VARIABLE _xorg_gtest_include_dir)
+    execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=sourcedir xorg-gtest OUTPUT_VARIABLE _xorg_gtest_source_dir)
+    execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=CPPflags xorg-gtest OUTPUT_VARIABLE _xorg_gtest_cflags)
+
+    string (STRIP ${_xorg_gtest_prefix} _xorg_gtest_prefix)
+    string (STRIP ${_xorg_gtest_include_dir} _xorg_gtest_include_dir)
+    string (STRIP ${_xorg_gtest_source_dir} _xorg_gtest_source_dir)
+    string (STRIP ${_xorg_gtest_cflags} _xorg_gtest_cflags)
+
+    set (XORG_SERVER_GTEST_INCLUDES ${XORG_SERVER_INCLUDE_DIRS})
+    set (XORG_SERVER_GTEST_LIBRARY_DIRS ${XORG_SERVER_LIBRARIES})
+    set (XORG_SERVER_GTEST_LIBRARIES} ${XORG_SERVER_LIBRARIES})
+    set (XORG_SERVER_INCLUDE_XORG_GTEST ${_xorg_gtest_include_dir} CACHE PATH "Path to Xorg GTest Headers")
+    set (XORG_SERVER_GTEST_SRC ${_xorg_gtest_source_dir} CACHE PATH "Path to Xorg GTest Sources")
+    set (XORG_SERVER_GTEST_CFLAGS ${_xorg_gtest_cflags})
+    set (XORG_SERVER_GTEST_ROOT ${CMAKE_SOURCE_DIR}/tests/xorg-gtest CACHE PATH "Path to Xorg GTest CMake sources")
+    set (COMPIZ_XORG_SYSTEM_TEST_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/tests/xorg-gtest/include CACHE PATH "Path to Compiz Xorg GTest Headers")
+    
+    message (STATUS "Found xorg-gtest sources at " ${XORG_SERVER_GTEST_SRC})
+    set (XORG_GTEST_FOUND ON)
+
+else (XORG_SERVER_FOUND)
+
+    message (WARNING "Could not found xorg-gtest, can't build xserver tests")
+    set (XORG_GTEST_FOUND OFF)
+
+endif (XORG_SERVER_FOUND)

=== added file 'cmake/GoogleTest.cmake'
--- cmake/GoogleTest.cmake	1970-01-01 00:00:00 +0000
+++ cmake/GoogleTest.cmake	2013-02-14 02:19:20 +0000
@@ -0,0 +1,20 @@
+# GoogleTest.cmake
+# build_google_test_locally (dir) takes a subdirectory
+# and builds Google Test in there locally if required
+
+function (build_google_test_locally build_directory)
+
+    if (GOOGLE_TEST_AND_MOCK_FOUND)
+
+	if (GTEST_LOCAL_BUILD_REQUIRED)
+
+	    add_subdirectory (${GTEST_ROOT_DIR}
+			      ${build_directory})
+
+	endif (GTEST_LOCAL_BUILD_REQUIRED)
+
+        include_directories (${GTEST_INCLUDE_DIRS})
+
+    endif (GOOGLE_TEST_AND_MOCK_FOUND)
+
+endfunction ()

=== added file 'cmake/XorgGTest.cmake'
--- cmake/XorgGTest.cmake	1970-01-01 00:00:00 +0000
+++ cmake/XorgGTest.cmake	2013-02-14 02:19:20 +0000
@@ -0,0 +1,14 @@
+# XorgGTest.cmake
+#
+# build_xorg_gtest_locally (dir) specifies a subdirectory to
+# build xorg-gtest in locally
+
+function (build_xorg_gtest_locally build_directory)
+
+    if (XORG_GTEST_FOUND)
+
+	add_subdirectory (${XORG_SERVER_GTEST_ROOT} ${build_directory})
+
+    endif (XORG_GTEST_FOUND)
+
+endfunction ()

=== modified file 'debian/control'
--- debian/control	2012-11-05 21:35:41 +0000
+++ debian/control	2013-02-14 02:19:20 +0000
@@ -34,8 +34,10 @@
                libxext-dev,
                libxdamage-dev (>=1:1.0.3),
                libxfixes-dev (>= 1:4.0.1),
+               libxi-dev,
                libxinerama-dev, 
                libxml-parser-perl,
+               libxorg-gtest-dev,
                libxrandr-dev (>= 2:1.1.0.2),
                libxrender-dev (>= 1:0.9.1), 
                libxcursor-dev,
@@ -54,6 +56,7 @@
                python-pyrex,
                gnome-control-center-dev,
                gsettings-desktop-schemas-dev,
+               xserver-xorg-dev (>= 0.7.0),
 Standards-Version: 3.9.3
 # If you aren't a member of ~compiz-team but need to upload packaging changes,
 # just go ahead.  ~compiz-team will notice and sync up the code again.

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-12-10 03:28:47 +0000
+++ debian/patches/series	2013-02-14 02:19:20 +0000
@@ -1,7 +1,7 @@
 ubuntu-config.patch
-ccp_plugin.patch
+#ccp_plugin.patch
 ccsm_remove_redundant_sliders.patch
 ccsm_add_first_run_warning.patch
 ccsm_disable_unity_checkbox.patch
 99_valid_ccsm_desktop_file.patch
-unity_support_test.patch
+#unity_support_test.patch

=== modified file 'src/event.cpp'
--- src/event.cpp	2013-01-03 16:06:41 +0000
+++ src/event.cpp	2013-02-14 02:19:20 +0000
@@ -1217,6 +1217,8 @@
      * Non-critical event handling that might be overridden by plugins
      */
 
+    fprintf (stderr, "received event of type 0x%x\n", event->type);
+
     CompWindow *w = NULL;
     XWindowAttributes wa;
 
@@ -1281,6 +1283,8 @@
     {
 	bool create = true;
 
+	fprintf (stderr, "received CreateNotify on 0x%x\n", (unsigned int) event->xcreatewindow.window);
+
 	/* Failure means that window has been destroyed. We still have to add 
 	 * the window to the window list as we might get configure requests
 	 * which require us to stack other windows relative to it. Setting

=== modified file 'src/screen.cpp'
--- src/screen.cpp	2013-02-03 17:58:29 +0000
+++ src/screen.cpp	2013-02-14 02:19:20 +0000
@@ -3582,6 +3582,8 @@
     bool   updateClientListStacking = false;
     int	   n = 0;
 
+    fprintf (stderr, "cps::WM::updateClientList\n");
+
     screen->forEachWindow (boost::bind (countClientListWindow, _1, &n));
 
     if (n == 0)
@@ -3620,7 +3622,10 @@
     {
 	CompWindow* const w(*i);
 	if (isClientListWindow (w))
+	{
+	    fprintf (stderr, "found window 0x%x\n", (unsigned int) w->id ());
 	    clientListStacking.push_back (w);
+	}
     }
 
     /* clear clientList and copy clientListStacking into clientList */
@@ -3659,11 +3664,14 @@
 			 (unsigned char *) &clientIdList.at (0), n);
 
     if (updateClientListStacking)
+    {
+	fprintf (stderr, "called XChangeProperty\n");
 	XChangeProperty (ps.dpy, ps.rootWindow(),
 			 Atoms::clientListStacking,
 			 XA_WINDOW, 32, PropModeReplace,
 			 (unsigned char *) &clientIdListStacking.at (0),
 			 n);
+    }
 }
 
 const CompWindowVector &

=== modified file 'src/window.cpp'
--- src/window.cpp	2013-02-12 22:02:10 +0000
+++ src/window.cpp	2013-02-14 02:19:20 +0000
@@ -6093,6 +6093,8 @@
 
     priv->window = this;
 
+    fprintf (stderr, "new window 0x%x created above 0x%x\n", (unsigned int) priv->id, (unsigned int) aboveId);
+
     screen->insertWindow (this, aboveId);
     screen->insertServerWindow (this, aboveServerId);
 

=== modified file 'tests/system/xorg-gtest/CMakeLists.txt'
--- tests/system/xorg-gtest/CMakeLists.txt	2012-11-28 14:33:20 +0000
+++ tests/system/xorg-gtest/CMakeLists.txt	2013-02-14 02:19:20 +0000
@@ -1,33 +1,5 @@
-include (FindPkgConfig)
-
-pkg_check_modules (XORG_SERVER xorg-gtest xorg-server x11)
-
-option (BUILD_XORG_GTEST "Build Xorg GTest integration tests" OFF)
-
-if (XORG_SERVER_FOUND AND BUILD_XORG_GTEST)
-
-    execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=prefix xorg-gtest OUTPUT_VARIABLE _xorg_gtest_prefix)
-    execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=includedir xorg-gtest OUTPUT_VARIABLE _xorg_gtest_include_dir)
-    execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=sourcedir xorg-gtest OUTPUT_VARIABLE _xorg_gtest_source_dir)
-    execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=CPPflags xorg-gtest OUTPUT_VARIABLE _xorg_gtest_cflags)
-
-    string (STRIP ${_xorg_gtest_prefix} _xorg_gtest_prefix)
-    string (STRIP ${_xorg_gtest_include_dir} _xorg_gtest_include_dir)
-    string (STRIP ${_xorg_gtest_source_dir} _xorg_gtest_source_dir)
-    string (STRIP ${_xorg_gtest_cflags} _xorg_gtest_cflags)
-
-    set (XORG_SERVER_INCLUDE_XORG_GTEST ${_xorg_gtest_include_dir} CACHE PATH "Path to Xorg GTest Headers")
-    set (XORG_SERVER_GTEST_SRC ${_xorg_gtest_source_dir} CACHE PATH "Path to Xorg GTest Sources")
-    set (COMPIZ_XORG_SYSTEM_TEST_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include CACHE PATH "Path to Compiz Xorg GTest Headers")
-    
-    message (STATUS "Found xorg-gtest sources at " ${XORG_SERVER_GTEST_SRC})
-
-    add_subdirectory (src)
+if (BUILD_XORG_GTEST)
+
     add_subdirectory (tests)
 
-else (XORG_SERVER_FOUND AND BUILD_XORG_GTEST)
-
-    message (WARNING "Could not found xorg-gtest, not building system tests")
-    set (BUILD_XORG_GTEST OFF)
-
-endif (XORG_SERVER_FOUND AND BUILD_XORG_GTEST)
+endif (BUILD_XORG_GTEST)

=== modified file 'tests/system/xorg-gtest/tests/CMakeLists.txt'
--- tests/system/xorg-gtest/tests/CMakeLists.txt	2013-01-11 07:57:32 +0000
+++ tests/system/xorg-gtest/tests/CMakeLists.txt	2013-02-14 02:19:20 +0000
@@ -2,6 +2,8 @@
 
 if (BUILD_XORG_GTEST AND X11_XI_FOUND)
 
+    message ("idir: " ${COMPIZ_XORG_SYSTEM_TEST_INCLUDE_DIR})
+
     include_directories (${compiz_SOURCE_DIR}/tests/shared
                          ${COMPIZ_XORG_SYSTEM_TEST_INCLUDE_DIR}
 			 ${X11_INCLUDE_DIRS}

=== added directory 'tests/xorg-gtest'
=== added file 'tests/xorg-gtest/CMakeLists.txt'
--- tests/xorg-gtest/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/xorg-gtest/CMakeLists.txt	2013-02-14 02:19:20 +0000
@@ -0,0 +1,49 @@
+set (COMPIZ_LD_LIBRARY_PATH ${CMAKE_BINARY_DIR}/src CACHE STRING "" FORCE)
+set (COMPIZ_BINARY ${CMAKE_BINARY_DIR}/src/compiz CACHE STRING "" FORCE)
+
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/src/compiz-xorg-gtest-config.h.in
+		${CMAKE_CURRENT_BINARY_DIR}/src/compiz-xorg-gtest-config.h
+		@ONLY)
+
+include_directories (${compiz_SOURCE_DIR}/tests/shared
+		     ${XORG_SERVER_INCLUDE_XORG_GTEST}
+		     ${XORG_SERVER_GTEST_INCLUDES}
+                     ${COMPIZ_XORG_SYSTEM_TEST_INCLUDE_DIR}
+		     ${CMAKE_CURRENT_BINARY_DIR}/src)
+
+link_directories (${XORG_SERVER_LIBRARY_DIRS})
+
+add_definitions (${XORG_SERVER_GTEST_CFLAGS})
+
+set (_xorg_gtest_all_srcs
+     ${XORG_SERVER_GTEST_SRC}/src/xorg-gtest-all.cpp)
+
+set (_xorg_gtest_main_srcs
+     ${XORG_SERVER_GTEST_SRC}/src/xorg-gtest_main.cpp)
+
+add_library (xorg_gtest_all STATIC
+	     ${_xorg_gtest_all_srcs})
+
+add_library (xorg_gtest_main STATIC
+	     ${_xorg_gtest_main_srcs})
+
+add_library (compiz_xorg_gtest_system_test STATIC
+	     ${CMAKE_CURRENT_SOURCE_DIR}/src/compiz-xorg-gtest.cpp)
+
+target_link_libraries (xorg_gtest_all
+		       ${GTEST_BOTH_LIBRARIES}
+		       ${CMAKE_THREAD_LIBS_INIT}
+		       ${XORG_SERVER_GTEST_LIBRARIES})
+
+target_link_libraries (xorg_gtest_main
+		       ${GTEST_BOTH_LIBRARIES}
+		       ${CMAKE_THREAD_LIBS_INIT}
+		       ${XORG_SERVER_GTEST_LIBRARIES})
+
+target_link_libraries (compiz_xorg_gtest_system_test
+		       xorg_gtest_all
+		       xorg_gtest_main
+		       ${GTEST_BOTH_LIBRARIES}
+		       ${CMAKE_THREAD_LIBS_INIT}
+		       ${XORG_SERVER_LIBRARIES}
+		       ${X11_XI_LIBRARIES})

=== renamed directory 'tests/system/xorg-gtest/include' => 'tests/xorg-gtest/include'
=== renamed directory 'tests/system/xorg-gtest/src' => 'tests/xorg-gtest/src'
=== modified file 'tests/xorg-gtest/src/CMakeLists.txt'
--- tests/system/xorg-gtest/src/CMakeLists.txt	2012-09-18 13:17:09 +0000
+++ tests/xorg-gtest/src/CMakeLists.txt	2013-02-14 02:19:20 +0000
@@ -1,51 +0,0 @@
-set (COMPIZ_LD_LIBRARY_PATH ${CMAKE_BINARY_DIR}/src CACHE STRING "" FORCE)
-set (COMPIZ_BINARY ${CMAKE_BINARY_DIR}/src/compiz CACHE STRING "" FORCE)
-
-configure_file (${CMAKE_CURRENT_SOURCE_DIR}/compiz-xorg-gtest-config.h.in
-		${CMAKE_CURRENT_BINARY_DIR}/compiz-xorg-gtest-config.h
-		@ONLY)
-
-add_definitions (${_xorg_gtest_cflags})
-
-include_directories (${COMPIZ_XORG_SYSTEM_TEST_INCLUDE_DIR}
-		     ${XORG_SERVER_INCLUDE_DIRS}
-		     ${GTEST_INCLUDE_DIRS}
-		     ${XORG_SERVER_INCLUDE_XORG_GTEST}
-		     ${XORG_SERVER_GTEST_SRC}
-		     ${CMAKE_CURRENT_BINARY_DIR})
-
-link_directories (${XORG_SERVER_LIBRARY_DIRS})
-
-# This actually includes xorg-gtest-all and the defines
-set (_xorg_gtest_all_srcs
-     ${XORG_SERVER_GTEST_SRC}/src/xorg-gtest-all.cpp)
-
-set (_xorg_gtest_main_srcs
-     ${XORG_SERVER_GTEST_SRC}/src/xorg-gtest_main.cpp)
-
-add_library (xorg_gtest_all STATIC
-	     ${_xorg_gtest_all_srcs})
-
-add_library (xorg_gtest_main STATIC
-	     ${_xorg_gtest_main_srcs})
-
-add_library (compiz_xorg_gtest_system_test STATIC
-	     ${CMAKE_CURRENT_SOURCE_DIR}/compiz-xorg-gtest.cpp)
-
-target_link_libraries (xorg_gtest_all
-		       ${GTEST_BOTH_LIBRARIES}
-		       ${CMAKE_THREAD_LIBS_INIT}
-		       ${XORG_SERVER_LIBRARIES})
-
-target_link_libraries (xorg_gtest_main
-		       ${GTEST_BOTH_LIBRARIES}
-		       ${CMAKE_THREAD_LIBS_INIT}
-		       ${XORG_SERVER_LIBRARIES})
-
-target_link_libraries (compiz_xorg_gtest_system_test
-		       xorg_gtest_all
-		       xorg_gtest_main
-		       ${GTEST_BOTH_LIBRARIES}
-		       ${CMAKE_THREAD_LIBS_INIT}
-		       ${XORG_SERVER_LIBRARIES}
-		       ${X11_XI_LIBRARIES})

=== modified file 'tests/xorg-gtest/src/compiz-xorg-gtest.cpp'
--- tests/system/xorg-gtest/src/compiz-xorg-gtest.cpp	2012-12-05 16:01:37 +0000
+++ tests/xorg-gtest/src/compiz-xorg-gtest.cpp	2013-02-14 02:19:20 +0000
@@ -28,6 +28,7 @@
 #include <boost/shared_ptr.hpp>
 #include <xorg/gtest/xorg-gtest.h>
 #include <compiz-xorg-gtest.h>
+#include <gtest_shared_tmpenv.h>
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 
@@ -386,6 +387,8 @@
 
     std::vector <std::string> args;
 
+    args.push_back ("--debug");
+
     if (flags & ct::CompizProcess::ReplaceCurrentWM)
 	args.push_back ("--replace");
 
@@ -420,7 +423,13 @@
 {
     public:
 
+	PrivateCompizXorgSystemTest () :
+	    env ("XORG_GTEST_CHILD_STDOUT", "1")
+	{
+	}
+
 	boost::shared_ptr <ct::CompizProcess> mProcess;
+	TmpEnv env;
 };
 
 ct::CompizXorgSystemTest::CompizXorgSystemTest () :