Merge lp:~compiz-team/compiz/compiz.compiz_discover_tests into lp:compiz/0.9.8

[Sam Spilsbury]

Added compiz_discover_tests.

gtest_add_tests is good for the basic Google Test usage, but its source
based scanning falls short in a couple of areas - namely it requires that
there be no space between TEST* and ( and it also does not work for templated
tests.

compiz_discover_tests builds a small C++ program to parse the output
of --gtest_list_tests and adds those at make-time to the CTestTestfile.cmake
in the current binary directory. This allows us to correctly introspect the test
 binary and get /all/ the tests regardless of the source file.

[Daniel van Vugt (vanvugt)]

'make ExperimentalMemCheck' now spits out cmake errors before running test cases.

Also, compiz_discover_gtest_tests.cpp seems to over-use 'std::'. Maybe put 'using namespace std' at the top and then remove 'std::' everywhere.

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

CMake Error: Error in cmake code at
/home/dan/bzr/compiz/tmp.discover/build/src/timer/tests/CTestTestfile.cmake:11:
Parse error. Expected a newline, got identifier with text "INCLUDE".
CMake Error at /home/dan/bzr/compiz/tmp.discover/build/src/timer/CTestTestfile.cmake:7 (SUBDIRS):
  subdirs Could not find include file:
  /home/dan/bzr/compiz/tmp.discover/build/src/timer/tests/CTestTestfile.cmake
Call Stack (most recent call first):
  /home/dan/bzr/compiz/tmp.discover/build/src/CTestTestfile.cmake:9 (SUBDIRS)
  CTestTestfile.cmake:16 (SUBDIRS)

CMake Error: Error in cmake code at
/home/dan/bzr/compiz/tmp.discover/build/src/pluginclasshandler/tests/CTestTestfile.cmake:10:
Parse error. Expected a newline, got identifier with text "INCLUDE".
CMake Error at /home/dan/bzr/compiz/tmp.discover/build/src/pluginclasshandler/CTestTestfile.cmake:7 (SUBDIRS):
  subdirs Could not find include file:
  /home/dan/bzr/compiz/tmp.discover/build/src/pluginclasshandler/tests/CTestTestfile.cmake
Call Stack (most recent call first):
  /home/dan/bzr/compiz/tmp.discover/build/src/CTestTestfile.cmake:10 (SUBDIRS)
  CTestTestfile.cmake:16 (SUBDIRS)

CMake Error: Error in cmake code at
/home/dan/bzr/compiz/tmp.discover/build/src/rect/tests/CTestTestfile.cmake:9:
Parse error. Expected a newline, got identifier with text "INCLUDE".
CMake Error at /home/dan/bzr/compiz/tmp.discover/build/src/rect/CTestTestfile.cmake:7 (SUBDIRS):
  subdirs Could not find include file:
  /home/dan/bzr/compiz/tmp.discover/build/src/rect/tests/CTestTestfile.cmake
Call Stack (most recent call first):
  /home/dan/bzr/compiz/tmp.discover/build/src/CTestTestfile.cmake:12 (SUBDIRS)
  CTestTestfile.cmake:16 (SUBDIRS)

CMake Error: Error in cmake code at
/home/dan/bzr/compiz/tmp.discover/build/compizconfig/libcompizconfig/tests/CTestTestfile.cmake:11:
Parse error. Expected a newline, got identifier with text "INCLUDE".
CMake Error at /home/dan/bzr/compiz/tmp.discover/build/compizconfig/libcompizconfig/CTestTestfile.cmake:12 (SUBDIRS):
  subdirs Could not find include file:
  /home/dan/bzr/compiz/tmp.discover/build/compizconfig/libcompizconfig/tests/CTestTestfile.cmake
Call Stack (most recent call first):
  /home/dan/bzr/compiz/tmp.discover/build/compizconfig/CTestTestfile.cmake:7 (SUBDIRS)
  CTestTestfile.cmake:17 (SUBDIRS)

[Sam Spilsbury (smspillaz)]

Okay, thanks I'll look into that.

(Strangely ctest -D ExperimentalMemCheck seems to work okay over here, maybe make ExperimentalMemcheck is doing something different)

[Sam Spilsbury (smspillaz)]

Fixed the small error when handling more than two tests defined in one CMakeLists.txt . thanks for spotting that.

[Daniel van Vugt (vanvugt)]

review: Approve

[Daniel van Vugt (vanvugt)]

This file gets installed:
    src/compiz/compiz_discover_gtest_tests.cpp

I would suggest not installing it while it's new, possibly subject to change and not used outside of lp:compiz.

review: Needs Fixing

[Sam Spilsbury (smspillaz)]

Ah.  The reason im installing it is so that external plugins can use it (sinilar to gtest)

Sent from Samsung Mobile

 Daniel van Vugt <email address hidden> wrote:

Review: Needs Fixing

This file gets installed:
    src/compiz/compiz_discover_gtest_tests.cpp

I would suggest not installing it while it's new, possibly subject to change and not used outside of lp:compiz.
--
https://code.launchpad.net/~compiz-team/compiz/compiz.compiz_discover_tests/+merge/113182
Your team Compiz Maintainers is subscribed to branch lp:compiz.

[Daniel van Vugt (vanvugt)]

Nice idea, but while it's new I think it should be private. So we can change it at will, for a while.

[Sam Spilsbury (smspillaz)]

Okay, I've made it not install to anywhere for now. When its ready, we can still freely make changes - other projects that build it locally will just rebuild it when it changes.

[lp:~compiz-team/compiz/compiz.compiz_discover_tests]

3277. By Sam Spilsbury on 2012-07-05

Remove the wrappers. They are not necessary like I originally thought

[Sam Spilsbury (smspillaz)]

The wrappers weren't necessary, so I removed them (thanks Alan for spotting that!)

[Daniel van Vugt (vanvugt)]

'make test' now passes so quickly that it can't possibly be running tests (0.8 sec for 119 tests).

review: Needs Fixing

[lp:~compiz-team/compiz/compiz.compiz_discover_tests]

3278. By Sam Spilsbury on 2012-07-05

Format the "" correctly so that the tests actually run

[Sam Spilsbury (smspillaz)]

thanks, was a bug in the formatting code. fixed.

Unmerged revisions

=== modified file 'cmake/CMakeLists.txt'
--- cmake/CMakeLists.txt	2012-05-24 00:55:17 +0000
+++ cmake/CMakeLists.txt	2012-07-05 05:37:21 +0000
@@ -32,3 +32,12 @@
     FILES ${_PluginExtensionFiles}
     DESTINATION ${CMAKE_INSTALL_PREFIX}/share/compiz/cmake/plugin_extensions
 )
+
+# Do not install src/compiz for a while until we've polished it up
+
+#install (DIRECTORY src/compiz
+#	 DESTINATION ${CMAKE_INSTALL_PREFIX}/src)
+
+if (COMPIZ_BUILD_TESTING)
+    add_subdirectory (src)
+endif (COMPIZ_BUILD_TESTING)
 
=== modified file 'cmake/CompizCommon.cmake'
--- cmake/CompizCommon.cmake	2012-05-24 06:48:55 +0000
+++ cmake/CompizCommon.cmake	2012-07-05 05:37:21 +0000
@@ -70,6 +70,21 @@
     set(IS_BZR_REPO 0)
 endif (IS_DIRECTORY ${CMAKE_SOURCE_DIR}/.bzr)
 
+# Create target to discover tests
+function (compiz_discover_tests EXECUTABLE)
+
+    add_dependencies (${EXECUTABLE}
+		      compiz_discover_gtest_tests)
+
+    add_custom_command (TARGET ${EXECUTABLE}
+			POST_BUILD
+			COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${EXECUTABLE} --gtest_list_tests | ${CMAKE_BINARY_DIR}/compiz_gtest/compiz_discover_gtest_tests ${CMAKE_CURRENT_BINARY_DIR}/${EXECUTABLE}
+			WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+			COMMENT "Discovering Tests in ${EXECUTABLE}"
+			DEPENDS 
+			VERBATIM)
+endfunction ()
+
 function (compiz_ensure_linkage)
     find_program (LDCONFIG_EXECUTABLE ldconfig)
     mark_as_advanced (FORCE LDCONFIG_EXECUTABLE)
 
=== added directory 'cmake/src'
=== added file 'cmake/src/CMakeLists.txt'
--- cmake/src/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ cmake/src/CMakeLists.txt	2012-07-05 05:37:21 +0000
@@ -0,0 +1,1 @@
+add_subdirectory (compiz)
 
=== added directory 'cmake/src/compiz'
=== added file 'cmake/src/compiz/CMakeLists.txt'
--- cmake/src/compiz/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ cmake/src/compiz/CMakeLists.txt	2012-07-05 05:37:21 +0000
@@ -0,0 +1,6 @@
+add_executable (compiz_discover_gtest_tests
+		EXCLUDE_FROM_ALL
+		${CMAKE_CURRENT_SOURCE_DIR}/compiz_discover_gtest_tests.cpp)
+
+set_target_properties (compiz_discover_gtest_tests PROPERTIES
+		       RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/compiz_gtest)
 
=== added file 'cmake/src/compiz/compiz_discover_gtest_tests.cpp'
--- cmake/src/compiz/compiz_discover_gtest_tests.cpp	1970-01-01 00:00:00 +0000
+++ cmake/src/compiz/compiz_discover_gtest_tests.cpp	2012-07-05 05:37:21 +0000
@@ -0,0 +1,99 @@
+#include <map>
+#include <vector>
+#include <string>
+#include <istream>
+#include <ostream>
+#include <fstream>
+#include <iterator>
+#include <iostream>
+#include <libgen.h>
+
+using namespace std;
+
+int main (int argc, char **argv)
+{
+    cin >> noskipws;
+
+    if (argc < 2)
+    {
+	cout << "Usage: PATH_TO_TEST_BINARY --gtest_list_tests | ./build_test_cases PATH_TO_TEST_BINARY";
+	return 1;
+    }
+
+    map<string, vector<string> > testCases;
+    string line;
+    string currentTestCase;
+
+    while (getline (cin, line))
+    {
+	/* Is test case */
+	if (line.find ("  ") == 0)
+	    testCases[currentTestCase].push_back (currentTestCase + line.substr (2));
+	else
+	    currentTestCase = line;
+
+    }
+
+    ofstream testfilecmake;
+    char *base = basename (argv[1]);
+    string   gtestName (base);
+
+    testfilecmake.open (string (gtestName  + "_test.cmake").c_str (), ios::out | ios::trunc);
+
+    if (testfilecmake.is_open ())
+    {
+	for (map <string, vector<string> >::iterator it = testCases.begin ();
+	     it != testCases.end (); it++)
+	{
+	    for (vector <string>::iterator jt = it->second.begin ();
+		 jt != it->second.end (); jt++)
+	    {
+		if (testfilecmake.good ())
+		{
+		    string addTest ("ADD_TEST (");
+		    string testExec (" \"" + string (argv[1]) + "\"");
+		    string gTestFilter ("\"--gtest_filter=");
+		    string endParen ("\")");
+
+		    testfilecmake << addTest << *jt << testExec << gTestFilter << *jt << endParen << endl;
+		}
+	    }
+	}
+
+	testfilecmake.close ();
+    }
+
+    ifstream CTestTestfile ("CTestTestfile.cmake", ifstream::in);
+    bool needsInclude = true;
+    line.clear ();
+
+    string includeLine = string ("INCLUDE (") +
+			      gtestName  +
+			      string ("_test.cmake)");
+
+    if (CTestTestfile.is_open ())
+    {
+	while (CTestTestfile.good ())
+	{
+	    getline (CTestTestfile, line);
+
+	    if (line == includeLine)
+		needsInclude = false;
+	}
+
+	CTestTestfile.close ();
+    }
+
+    if (needsInclude)
+    {
+	ofstream CTestTestfileW ("CTestTestfile.cmake", ofstream::app | ofstream::out);
+
+	if (CTestTestfileW.is_open ())
+	{
+	    CTestTestfileW << includeLine << endl;
+	    CTestTestfileW.close ();
+	}
+    }
+
+    return 0;
+}
 
=== modified file 'compizconfig/libcompizconfig/tests/CMakeLists.txt'
--- compizconfig/libcompizconfig/tests/CMakeLists.txt	2012-06-26 12:22:35 +0000
+++ compizconfig/libcompizconfig/tests/CMakeLists.txt	2012-07-05 05:37:21 +0000
@@ -94,7 +94,7 @@
 		       plugin-mock
 		       setting-mock)
 
-gtest_add_tests (test-ccs-object "" ${CMAKE_CURRENT_SOURCE_DIR}/test-ccs-object.cpp)
-gtest_add_tests (test-context "" ${CMAKE_CURRENT_SOURCE_DIR}/test-context.cpp)
-gtest_add_tests (test-plugin "" ${CMAKE_CURRENT_SOURCE_DIR}/test-plugin.cpp)
-gtest_add_tests (test-setting "" ${CMAKE_CURRENT_SOURCE_DIR}/test-setting.cpp)
+compiz_discover_tests (test-ccs-object)
+compiz_discover_tests (test-context)
+compiz_discover_tests (test-plugin)
+compiz_discover_tests (test-setting)
 
=== modified file 'plugins/composite/src/pixmapbinding/tests/CMakeLists.txt'
--- plugins/composite/src/pixmapbinding/tests/CMakeLists.txt	2012-05-31 07:15:37 +0000
+++ plugins/composite/src/pixmapbinding/tests/CMakeLists.txt	2012-07-05 05:37:21 +0000
@@ -21,4 +21,4 @@
 		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
                        )
 
-gtest_add_tests (compiz_test_composite_pixmapbinding "" ${CMAKE_CURRENT_SOURCE_DIR}/test-composite-pixmapbinding.cpp)
+compiz_discover_tests (compiz_test_composite_pixmapbinding)
 
=== modified file 'plugins/decor/src/clip-groups/tests/CMakeLists.txt'
--- plugins/decor/src/clip-groups/tests/CMakeLists.txt	2012-03-30 16:06:07 +0000
+++ plugins/decor/src/clip-groups/tests/CMakeLists.txt	2012-07-05 05:37:21 +0000
@@ -11,4 +11,4 @@
 		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. 
                        )
 
-gtest_add_tests (compiz_test_decor_clip_groups "" ${CMAKE_CURRENT_SOURCE_DIR}/clip-groups/src/test-decor-clip-groups.cpp)
+compiz_discover_tests (compiz_test_decor_clip_groups)
 
=== modified file 'plugins/decor/src/pixmap-requests/tests/CMakeLists.txt'
--- plugins/decor/src/pixmap-requests/tests/CMakeLists.txt	2012-05-10 15:40:25 +0000
+++ plugins/decor/src/pixmap-requests/tests/CMakeLists.txt	2012-07-05 05:37:21 +0000
@@ -12,4 +12,4 @@
 		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. 
                        )
 
-gtest_add_tests (compiz_test_decor_pixmap_requests "" ${CMAKE_CURRENT_SOURCE_DIR}/pixmap-requests/src/test-decor-pixmap-requests.cpp)
+compiz_discover_tests (compiz_test_decor_pixmap_requests)
 
=== modified file 'plugins/grid/src/grabhandler/tests/CMakeLists.txt'
--- plugins/grid/src/grabhandler/tests/CMakeLists.txt	2012-05-28 06:48:42 +0000
+++ plugins/grid/src/grabhandler/tests/CMakeLists.txt	2012-07-05 05:37:21 +0000
@@ -21,4 +21,4 @@
 		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
                        )
 
-gtest_add_tests (compiz_test_grid_grabhandler "" ${CMAKE_CURRENT_SOURCE_DIR}/test-grid-grab-handler.cpp)
+compiz_discover_tests (compiz_test_grid_grabhandler)
 
=== modified file 'plugins/place/src/constrain-to-workarea/tests/CMakeLists.txt'
--- plugins/place/src/constrain-to-workarea/tests/CMakeLists.txt	2012-03-30 16:30:13 +0000
+++ plugins/place/src/constrain-to-workarea/tests/CMakeLists.txt	2012-07-05 05:37:21 +0000
@@ -15,4 +15,4 @@
 		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. 
                        )
 
-gtest_add_tests (compiz_test_place_constrain_to_workarea "" ${CMAKE_CURRENT_SOURCE_DIR}/constrain-to-workarea/src/test-place-constrain-to-workarea.cpp)
+compiz_discover_tests (compiz_test_place_constrain_to_workarea)
 
=== modified file 'plugins/place/src/screen-size-change/tests/CMakeLists.txt'
--- plugins/place/src/screen-size-change/tests/CMakeLists.txt	2012-03-30 16:30:13 +0000
+++ plugins/place/src/screen-size-change/tests/CMakeLists.txt	2012-07-05 05:37:21 +0000
@@ -15,4 +15,4 @@
 		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. 
                        )
 
-gtest_add_tests (compiz_test_place_screen_size_change "" ${CMAKE_CURRENT_SOURCE_DIR}/screen-size-change/src/test-place-screen-size-change.cpp)
+compiz_discover_tests (compiz_test_place_screen_size_change)
 
=== modified file 'plugins/place/src/smart/tests/CMakeLists.txt'
--- plugins/place/src/smart/tests/CMakeLists.txt	2012-03-30 16:30:13 +0000
+++ plugins/place/src/smart/tests/CMakeLists.txt	2012-07-05 05:37:21 +0000
@@ -11,4 +11,4 @@
 		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. 
                        )
 
-gtest_add_tests (compiz_test_place_smart_on_screen "" ${CMAKE_CURRENT_SOURCE_DIR}/offscreen/src/test-place-smart-on-screen.cpp)
+compiz_discover_tests (compiz_test_place_smart_on_screen)
 
=== modified file 'plugins/wall/src/offset_movement/tests/CMakeLists.txt'
--- plugins/wall/src/offset_movement/tests/CMakeLists.txt	2012-05-21 06:43:20 +0000
+++ plugins/wall/src/offset_movement/tests/CMakeLists.txt	2012-07-05 05:37:21 +0000
@@ -21,4 +21,4 @@
 		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
                        )
 
-gtest_add_tests (compiz_test_wall_offset_movement "" ${CMAKE_CURRENT_SOURCE_DIR}/test-wall-offset-movement.cpp)
+compiz_discover_tests (compiz_test_wall_offset_movement)
 
=== modified file 'src/option/tests/CMakeLists.txt'
--- src/option/tests/CMakeLists.txt	2012-05-21 06:43:20 +0000
+++ src/option/tests/CMakeLists.txt	2012-07-05 05:37:21 +0000
@@ -28,4 +28,4 @@
   ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
 )
 
-gtest_add_tests( compiz_option_test "" ${CMAKE_CURRENT_SOURCE_DIR}/option.cpp )
+compiz_discover_tests ( compiz_option_test )
 
=== modified file 'src/plugin/tests/CMakeLists.txt'
--- src/plugin/tests/CMakeLists.txt	2012-06-24 09:00:27 +0000
+++ src/plugin/tests/CMakeLists.txt	2012-07-05 05:37:21 +0000
@@ -32,5 +32,5 @@
   ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
 )
 
-env_gtest_add_tests( compiz_plugin_test "" ${CMAKE_CURRENT_SOURCE_DIR}/test-plugin.cpp )
+compiz_discover_tests ( compiz_plugin_test )
 
 
=== modified file 'src/pluginclasshandler/tests/CMakeLists.txt'
--- src/pluginclasshandler/tests/CMakeLists.txt	2012-03-30 16:30:13 +0000
+++ src/pluginclasshandler/tests/CMakeLists.txt	2012-07-05 05:37:21 +0000
@@ -74,8 +74,8 @@
 #  gtest_main
 #)
 
-gtest_add_tests( compiz_pch_construct "" ${CMAKE_CURRENT_SOURCE_DIR}/construct/src/test-pch-construct.cpp )
-gtest_add_tests( compiz_pch_get "" ${CMAKE_CURRENT_SOURCE_DIR}/get/src/test-pch-get.cpp )
+compiz_discover_tests (compiz_pch_construct)
+compiz_discover_tests (compiz_pch_get)
 #add_test( compiz_pch_indexes compiz_pch_indexes )
-gtest_add_tests( compiz_pch_typenames "" ${CMAKE_CURRENT_SOURCE_DIR}/typenames/src/test-pch-typenames.cpp )
+compiz_discover_tests (compiz_pch_typenames)
 
 
=== modified file 'src/point/tests/CMakeLists.txt'
--- src/point/tests/CMakeLists.txt	2012-03-30 16:30:13 +0000
+++ src/point/tests/CMakeLists.txt	2012-07-05 05:37:21 +0000
@@ -15,4 +15,4 @@
 		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. 
                        )
 
-gtest_add_tests (compiz_test_point "" ${CMAKE_CURRENT_SOURCE_DIR}/point/src/test-point.cpp)
+compiz_discover_tests (compiz_test_point)
 
=== modified file 'src/privatescreen/tests/CMakeLists.txt'
--- src/privatescreen/tests/CMakeLists.txt	2012-06-24 09:00:27 +0000
+++ src/privatescreen/tests/CMakeLists.txt	2012-07-05 05:37:21 +0000
@@ -53,4 +53,4 @@
   ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
 )
 
-env_gtest_add_tests( compiz_privatescreen_test "" ${CMAKE_CURRENT_SOURCE_DIR}/test-privatescreen.cpp )
+compiz_discover_tests (compiz_privatescreen_test)
 
=== modified file 'src/rect/tests/CMakeLists.txt'
--- src/rect/tests/CMakeLists.txt	2012-03-30 16:30:13 +0000
+++ src/rect/tests/CMakeLists.txt	2012-07-05 05:37:21 +0000
@@ -27,5 +27,5 @@
 		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. 
                        )
 
-gtest_add_tests (compiz_test_rect "" ${CMAKE_CURRENT_SOURCE_DIR}/rect/src/test-rect.cpp)
-gtest_add_tests (compiz_test_rect_wraparound_point "" ${CMAKE_CURRENT_SOURCE_DIR}/wraparound_point/src/test-rect-wraparound-point.cpp)
+compiz_discover_tests (compiz_test_rect)
+compiz_discover_tests (compiz_test_rect_wraparound_point)
 
=== modified file 'src/region/tests/CMakeLists.txt'
--- src/region/tests/CMakeLists.txt	2012-05-21 06:43:20 +0000
+++ src/region/tests/CMakeLists.txt	2012-07-05 05:37:21 +0000
@@ -33,4 +33,4 @@
   ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
 )
 
-gtest_add_tests( compiz_region_test "" ${CMAKE_CURRENT_SOURCE_DIR}/test-region.cpp )
+compiz_discover_tests (compiz_region_test)
 
=== modified file 'src/servergrab/tests/CMakeLists.txt'
--- src/servergrab/tests/CMakeLists.txt	2012-05-28 07:53:38 +0000
+++ src/servergrab/tests/CMakeLists.txt	2012-07-05 05:37:21 +0000
@@ -11,4 +11,4 @@
 		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. 
 		      )
 
-gtest_add_tests (compiz_test_servergrab "" ${CMAKE_CURRENT_SOURCE_DIR}/test-servergrab.cpp)
+compiz_discover_tests (compiz_test_servergrab)
 
=== modified file 'src/string/tests/CMakeLists.txt'
--- src/string/tests/CMakeLists.txt	2012-03-30 16:30:13 +0000
+++ src/string/tests/CMakeLists.txt	2012-07-05 05:37:21 +0000
@@ -17,4 +17,4 @@
   ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
 )
 
-gtest_add_tests( compiz_string_test "" ${CMAKE_CURRENT_SOURCE_DIR}/printf/src/test-string-printf.cpp )
+compiz_discover_tests (compiz_string_test)
 
=== modified file 'src/timer/tests/CMakeLists.txt'
--- src/timer/tests/CMakeLists.txt	2012-03-30 16:30:13 +0000
+++ src/timer/tests/CMakeLists.txt	2012-07-05 05:37:21 +0000
@@ -51,7 +51,7 @@
 		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. 
                        )
 
-gtest_add_tests (compiz_timer_callbacks "" ${CMAKE_CURRENT_SOURCE_DIR}/callbacks/src/test-timer-callbacks.cpp)
-gtest_add_tests (compiz_timer_diffs "" ${CMAKE_CURRENT_SOURCE_DIR}/diffs/src/test-timer-diffs.cpp)
-gtest_add_tests (compiz_timer_set-values ""  ${CMAKE_CURRENT_SOURCE_DIR}/set-values/src/test-timer-set-values.cpp)
-gtest_add_tests (compiz_timer_while-calling "" ${CMAKE_CURRENT_SOURCE_DIR}/while-calling/src/test-timer-set-times-while-calling.cpp)
+compiz_discover_tests (compiz_timer_callbacks)
+compiz_discover_tests (compiz_timer_diffs)
+compiz_discover_tests (compiz_timer_set-values)
+compiz_discover_tests (compiz_timer_while-calling)
 
=== modified file 'src/window/constrainment/tests/CMakeLists.txt'
--- src/window/constrainment/tests/CMakeLists.txt	2012-03-30 16:30:13 +0000
+++ src/window/constrainment/tests/CMakeLists.txt	2012-07-05 05:37:21 +0000
@@ -16,4 +16,4 @@
 		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. 
                        )
 
-gtest_add_tests ( compiz_test_window_constrainment_to_hints "" ${CMAKE_CURRENT_SOURCE_DIR}/to-hints/src/test-window-constrainment-to-hints.cpp)
+compiz_discover_tests (compiz_test_window_constrainment_to_hints)
 
=== modified file 'src/window/extents/tests/CMakeLists.txt'
--- src/window/extents/tests/CMakeLists.txt	2012-03-30 16:30:13 +0000
+++ src/window/extents/tests/CMakeLists.txt	2012-07-05 05:37:21 +0000
@@ -15,4 +15,4 @@
 		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. 
                        )
 
-gtest_add_tests (compiz_test_window_extents_shift "" ${CMAKE_CURRENT_SOURCE_DIR}/shift/src/test-window-extents-shift.cpp)
+compiz_discover_tests (compiz_test_window_extents_shift)
 
=== modified file 'src/window/geometry-saver/tests/CMakeLists.txt'
--- src/window/geometry-saver/tests/CMakeLists.txt	2012-03-30 16:30:13 +0000
+++ src/window/geometry-saver/tests/CMakeLists.txt	2012-07-05 05:37:21 +0000
@@ -15,4 +15,4 @@
 		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. 
                        )
 
-gtest_add_tests (compiz_test_window_geometry_saver "" ${CMAKE_CURRENT_SOURCE_DIR}/window-geometry-saver/src/test-window-geometry-saver.cpp)
+compiz_discover_tests (compiz_test_window_geometry_saver)
 
=== modified file 'src/window/geometry/tests/CMakeLists.txt'
--- src/window/geometry/tests/CMakeLists.txt	2012-03-30 16:30:13 +0000
+++ src/window/geometry/tests/CMakeLists.txt	2012-07-05 05:37:21 +0000
@@ -15,4 +15,4 @@
 		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. 
                        )
 
-gtest_add_tests (compiz_test_window_geometry "" ${CMAKE_CURRENT_SOURCE_DIR}/window-geometry/src/test-window-geometry.cpp)
+compiz_discover_tests (compiz_test_window_geometry)
 
=== modified file 'src/wrapsystem/tests/CMakeLists.txt'
--- src/wrapsystem/tests/CMakeLists.txt	2012-05-21 08:58:41 +0000
+++ src/wrapsystem/tests/CMakeLists.txt	2012-07-05 05:37:21 +0000
@@ -15,4 +15,4 @@
   ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
 )
 
-gtest_add_tests (${CMAKE_CURRENT_BINARY_DIR}/compiz_wrapsystem_test "" "test-wrapsystem.cpp")
+compiz_discover_tests (compiz_wrapsystem_test)
 \ No newline at end of file