Merge lp:~brianaker/gearmand/prove-patch1 into lp:gearmand

[Brian Aker]

=== modified file '.bzrignore'
--- .bzrignore	2013-06-30 02:48:43 +0000
+++ .bzrignore	2013-07-03 03:55:32 +0000
@@ -57,8 +57,6 @@
 man/.doctrees/
 gearmand/gearmand
 gearmand/hostile_gearmand
-libgearman-1.0/t/c_test
-libgearman-1.0/t/cc_test
 libhostile/t/accept
 libhostile/t/close
 libhostile/t/hostile_accept
@@ -70,30 +68,7 @@
 libtest/abort
 libtest/backtrace
 libtest/core-count
-libtest/skiptest
-libtest/unittest
 libtest/wait
-tests/blobslap_client
-tests/c_test
-tests/cli
-tests/cpp_test
-tests/cycle
-tests/drizzle_test
-tests/ephemeral_test
-tests/gearmand
-tests/hostile_gearmand
-tests/hostile_libgearman
-tests/httpd_test
-tests/memcached_test
-tests/mysql_test
-tests/postgres_test
-tests/redis_test
-tests/result
-tests/round_robin_test
-tests/sqlite_test
-tests/stress
-tests/tokyocabinet_test
-tests/vector
 tests/libgearman-1.0/1077917
 tests/libgearman-1.0/client_test
 tests/libgearman-1.0/internals_test
@@ -120,3 +95,33 @@
 libgearman/command.hpp
 libgearman/error_code.hpp
 TAGS
+t/1077917
+t/blobslap_client
+t/c
+t/cli
+t/client
+t/cpp
+t/cycle
+t/drizzle
+t/ephemeral
+t/gearmand
+t/hostile_gearmand
+t/hostile_libgearman
+t/httpd
+t/internals
+t/libgearman-1.0
+t/memcached
+t/multi_client
+t/mysql
+t/postgres
+t/protocol
+t/redis
+t/result
+t/round_robin
+t/skip
+t/sqlite
+t/stress
+t/tokyocabinet
+t/unittest
+t/vector
+t/worker

=== modified file 'libtest/include.am'
--- libtest/include.am	2013-05-30 17:08:58 +0000
+++ libtest/include.am	2013-07-03 03:55:32 +0000
@@ -113,6 +113,7 @@
 
 libtest_libtest_la_CXXFLAGS=
 EXTRA_libtest_libtest_la_DEPENDENCIES=
+libtest_libtest_la_LDFLAGS=
 libtest_libtest_la_LIBADD=
 libtest_libtest_la_SOURCES=
 libtest_libtest_la_CXXFLAGS+= @LIBMEMCACHED_CFLAGS@
@@ -165,11 +166,6 @@
 EXTRA_libtest_libtest_la_DEPENDENCIES+= libtest/abort
 EXTRA_libtest_libtest_la_DEPENDENCIES+= libtest/wait
 
-# Declare unittest so that we can append to it
-libtest_unittest_CXXFLAGS=
-libtest_unittest_LDADD=
-libtest_libtest_la_LDFLAGS=
-
 # We are either building in tree, or with
 libtest_libtest_la_SOURCES+= libtest/memcached.cc
 
@@ -190,45 +186,50 @@
 $(TMP_DIR):
 	@$(mkdir_p) $(TMP_DIR)
 
-libtest_unittest_LDADD+= libtest/libtest.la
-libtest_unittest_SOURCES= libtest/unittest.cc
-check_PROGRAMS+= libtest/unittest
-noinst_PROGRAMS+= libtest/unittest
-test-unittest: libtest/unittest
-	@libtest/unittest
-
-valgrind-unittest: libtest/unittest
-	@$(VALGRIND_COMMAND) libtest/unittest
-
-gdb-unittest: libtest/unittest
-	@$(GDB_COMMAND) libtest/unittest
-
-helgrind-unittest: libtest/unittest
-	@$(HELGRIND_COMMAND) libtest/unittest
-
-drd-unittest: libtest/unittest
-	@$(DRD_COMMAND) libtest/unittest
-
-sgcheck-unittest: libtest/unittest
+# Declare unittest so that we can append to it
+t_unittest_CXXFLAGS=
+t_unittest_LDADD=
+t_unittest_SOURCES=
+
+t_unittest_LDADD+= libtest/libtest.la
+t_unittest_SOURCES+= libtest/unittest.cc
+check_PROGRAMS+= t/unittest
+noinst_PROGRAMS+= t/unittest
+test-unittest: t/unittest
+	@t/unittest
+
+valgrind-unittest: t/unittest
+	@$(VALGRIND_COMMAND) t/unittest
+
+gdb-unittest: t/unittest
+	@$(GDB_COMMAND) t/unittest
+
+helgrind-unittest: t/unittest
+	@$(HELGRIND_COMMAND) t/unittest
+
+drd-unittest: t/unittest
+	@$(DRD_COMMAND) t/unittest
+
+sgcheck-unittest: t/unittest
 	echo $(SGCHECK_COMMAND)
-	@$(SGCHECK_COMMAND) libtest/unittest
-
-libtest_skiptest_LDADD= libtest/libtest.la
-libtest_skiptest_SOURCES= libtest/skiptest.cc
-check_PROGRAMS+= libtest/skiptest
-noinst_PROGRAMS+= libtest/skiptest
-
-test-skiptest: libtest/skiptest
-	@libtest/skiptest
-
-valgrind-skiptest: libtest/skiptest
-	@$(VALGRIND_COMMAND) libtest/skiptest
-
-helgrind-skiptest: libtest/skiptest
-	@$(HELGRIND_COMMAND) libtest/skiptest
-
-drd-skiptest: libtest/skiptest
-	@$(DRD_COMMAND) libtest/skiptest
+	@$(SGCHECK_COMMAND) t/unittest
+
+t_skip_LDADD= libtest/libtest.la
+t_skip_SOURCES= libtest/skiptest.cc
+check_PROGRAMS+= t/skip
+noinst_PROGRAMS+= t/skip
+
+test-skip: t/skip
+	@t/skip
+
+valgrind-skip: t/skip
+	@$(VALGRIND_COMMAND) t/skip
+
+helgrind-skip: libtest/skip
+	@$(HELGRIND_COMMAND) t/skip
+
+drd-skip: t/skip
+	@$(DRD_COMMAND) t/skip
 
 libtest_wait_SOURCES=
 libtest_wait_SOURCES+= libtest/wait.cc

=== added directory 't'
=== modified file 'tests/ephemeral.am'
--- tests/ephemeral.am	2012-12-17 06:25:48 +0000
+++ tests/ephemeral.am	2013-07-03 03:55:32 +0000
@@ -10,24 +10,24 @@
 # All paths should be given relative to the root
 #
 
-tests_ephemeral_test_SOURCES=
-tests_ephemeral_test_CXXFLAGS=
-tests_ephemeral_test_LDADD= ${CLIENT_LDADD}
-
-tests_ephemeral_test_SOURCES+= tests/basic.cc
-tests_ephemeral_test_SOURCES+= tests/ephemeral_test.cc
-
-check_PROGRAMS += tests/ephemeral_test
-noinst_PROGRAMS += tests/ephemeral_test
-
-test-ephemeral: tests/ephemeral_test gearmand/gearmand
+t_ephemeral_SOURCES=
+t_ephemeral_CXXFLAGS=
+t_ephemeral_LDADD= ${CLIENT_LDADD}
+
+t_ephemeral_SOURCES+= tests/basic.cc
+t_ephemeral_SOURCES+= tests/ephemeral_test.cc
+
+check_PROGRAMS += t/ephemeral
+noinst_PROGRAMS += t/ephemeral
+
+test-ephemeral: t/ephemeral gearmand/gearmand
 	@tests/ephemeral_test
 
-gdb-ephemeral: tests/ephemeral_test gearmand/gearmand
-	@$(GDB_COMMAND) tests/ephemeral_test
-
-helgrind-ephemeral: tests/ephemeral_test gearmand/gearmand
-	@$(HELGRIND_COMMAND) tests/ephemeral_test
-
-valgrind-ephemeral: tests/ephemeral_test gearmand/gearmand
-	@$(VALGRIND_COMMAND) tests/ephemeral_test
+gdb-ephemeral: t/ephemeral gearmand/gearmand
+	@$(GDB_COMMAND) tests/ephemeral
+
+helgrind-ephemeral: t/ephemeral gearmand/gearmand
+	@$(HELGRIND_COMMAND) t/ephemeral
+
+valgrind-ephemeral: t/ephemeral gearmand/gearmand
+	@$(VALGRIND_COMMAND) t/ephemeral

=== modified file 'tests/hostile.am'
--- tests/hostile.am	2013-01-29 19:42:31 +0000
+++ tests/hostile.am	2013-07-03 03:55:32 +0000
@@ -10,65 +10,65 @@
 # All paths should be given relative to the root
 #
 
-tests_hostile_gearmand_CFLAGS=
-tests_hostile_gearmand_CXXFLAGS=
-tests_hostile_gearmand_LDADD=
-tests_hostile_gearmand_SOURCES=
-
-tests_hostile_gearmand_CXXFLAGS+= -DHAVE_LIBHOSTILE=1
-tests_hostile_gearmand_CFLAGS+= -DHAVE_LIBHOSTILE=1
-tests_hostile_gearmand_LDADD+= libhostile/libhostile.la
-if TARGET_LINUX
-tests_hostile_gearmand_LDADD+= @DL_LIB@
-tests_hostile_gearmand_LDADD+= @RT_LIB@
-endif
-
-tests_hostile_gearmand_SOURCES+= tests/hostile.cc
-tests_hostile_gearmand_LDADD+= libgearman/libgearman.la
-tests_hostile_gearmand_LDADD+= libtest/libtest.la
-tests_hostile_gearmand_LDADD+= tests/libstartworker.la
-check_PROGRAMS+=tests/hostile_gearmand
-noinst_PROGRAMS+=tests/hostile_gearmand
-
-test-hostile-gearmand: tests/hostile_gearmand gearmand/gearmand gearmand/hostile_gearmand
-	@tests/hostile_gearmand
-
-valgrind-hostile-gearmand: tests/hostile_gearmand gearmand/gearmand gearmand/hostile_gearmand
-	@$(VALGRIND_COMMAND) tests/hostile_gearmand
-
-gdb-hostile-gearmand: tests/hostile_gearmand gearmand/gearmand gearmand/hostile_gearmand
-	@$(GDB_COMMAND) tests/hostile_gearmand
-
-tests_hostile_libgearman_CFLAGS=
-tests_hostile_libgearman_CXXFLAGS=
-tests_hostile_libgearman_LDADD=
-tests_hostile_libgearman_SOURCES=
-
-tests_hostile_libgearman_CXXFLAGS+= -DHAVE_LIBHOSTILE=1
-tests_hostile_libgearman_CFLAGS+= -DHAVE_LIBHOSTILE=1
-tests_hostile_libgearman_CXXFLAGS+= -DSERVER_TARGET="\"gearmand\""
-tests_hostile_libgearman_CFLAGS+= -DSERVER_TARGET="\"gearmand\""
-tests_hostile_libgearman_LDADD+= libhostile/libhostile.la
-if TARGET_LINUX
-tests_hostile_libgearman_LDADD+= @DL_LIB@
-tests_hostile_libgearman_LDADD+= @RT_LIB@
-endif
-
-tests_hostile_libgearman_SOURCES+= tests/hostile.cc
-tests_hostile_libgearman_LDADD+= libgearman/libgearman-hostile.la
-tests_hostile_libgearman_LDADD+= libtest/libtest.la
-tests_hostile_libgearman_LDADD+= tests/libstartworker.la
+t_hostile_gearmand_CFLAGS=
+t_hostile_gearmand_CXXFLAGS=
+t_hostile_gearmand_LDADD=
+t_hostile_gearmand_SOURCES=
+
+t_hostile_gearmand_CXXFLAGS+= -DHAVE_LIBHOSTILE=1
+t_hostile_gearmand_CFLAGS+= -DHAVE_LIBHOSTILE=1
+t_hostile_gearmand_LDADD+= libhostile/libhostile.la
+if TARGET_LINUX
+t_hostile_gearmand_LDADD+= @DL_LIB@
+t_hostile_gearmand_LDADD+= @RT_LIB@
+endif
+
+t_hostile_gearmand_SOURCES+= tests/hostile.cc
+t_hostile_gearmand_LDADD+= libgearman/libgearman.la
+t_hostile_gearmand_LDADD+= libtest/libtest.la
+t_hostile_gearmand_LDADD+= tests/libstartworker.la
+check_PROGRAMS+=t/hostile_gearmand
+noinst_PROGRAMS+=t/hostile_gearmand
+
+test-hostile-gearmand: t/hostile_gearmand gearmand/gearmand gearmand/hostile_gearmand
+	@t/hostile_gearmand
+
+valgrind-hostile-gearmand: t/hostile_gearmand gearmand/gearmand gearmand/hostile_gearmand
+	@$(VALGRIND_COMMAND) t/hostile_gearmand
+
+gdb-hostile-gearmand: t/hostile_gearmand gearmand/gearmand gearmand/hostile_gearmand
+	@$(GDB_COMMAND) t/hostile_gearmand
+
+t_hostile_libgearman_CFLAGS=
+t_hostile_libgearman_CXXFLAGS=
+t_hostile_libgearman_LDADD=
+t_hostile_libgearman_SOURCES=
+
+t_hostile_libgearman_CXXFLAGS+= -DHAVE_LIBHOSTILE=1
+t_hostile_libgearman_CFLAGS+= -DHAVE_LIBHOSTILE=1
+t_hostile_libgearman_CXXFLAGS+= -DSERVER_TARGET="\"gearmand\""
+t_hostile_libgearman_CFLAGS+= -DSERVER_TARGET="\"gearmand\""
+t_hostile_libgearman_LDADD+= libhostile/libhostile.la
+if TARGET_LINUX
+t_hostile_libgearman_LDADD+= @DL_LIB@
+t_hostile_libgearman_LDADD+= @RT_LIB@
+endif
+
+t_hostile_libgearman_SOURCES+= tests/hostile.cc
+t_hostile_libgearman_LDADD+= libgearman/libgearman-hostile.la
+t_hostile_libgearman_LDADD+= libtest/libtest.la
+t_hostile_libgearman_LDADD+= tests/libstartworker.la
 # check_PROGRAMS+=tests/hostile_libgearman
-noinst_PROGRAMS+=tests/hostile_libgearman
-
-test-hostile_libgearman: tests/hostile_libgearman gearmand/gearmand
-	@tests/hostile_libgearman
-
-valgrind-hostile_libgearman: tests/hostile_libgearman gearmand/gearmand
-	@$(VALGRIND_COMMAND) tests/hostile_libgearman
-
-gdb-hostile_libgearman: tests/hostile_libgearman gearmand/gearmand
-	@$(GDB_COMMAND) tests/hostile_libgearman
+noinst_PROGRAMS+=t/hostile_libgearman
+
+test-hostile_libgearman: t/hostile_libgearman gearmand/gearmand
+	@t/hostile_libgearman
+
+valgrind-hostile_libgearman: t/hostile_libgearman gearmand/gearmand
+	@$(VALGRIND_COMMAND) t/hostile_libgearman
+
+gdb-hostile_libgearman: t/hostile_libgearman gearmand/gearmand
+	@$(GDB_COMMAND) t/hostile_libgearman
 
 hostile: test-hostile-gearmand test-hostile_libgearman
 

=== modified file 'tests/httpd.am'
--- tests/httpd.am	2012-12-17 06:25:48 +0000
+++ tests/httpd.am	2013-07-03 03:55:32 +0000
@@ -10,24 +10,24 @@
 # All paths should be given relative to the root
 #
 
-tests_httpd_test_SOURCES=
-tests_httpd_test_LDADD=
-
-tests_httpd_test_SOURCES+= tests/httpd_test.cc
-
-tests_httpd_test_LDADD+= $(CLIENT_LDADD)
-
-#check_PROGRAMS+= tests/httpd_test
-noinst_PROGRAMS+= tests/httpd_test
-
-test-httpd: tests/httpd_test gearmand/gearmand
-	@tests/httpd_test
-
-gdb-httpd: tests/httpd_test gearmand/gearmand
-	@$(GDB_COMMAND) tests/httpd_test
-
-helgrind-httpd: tests/httpd_test gearmand/gearmand
-	@$(HELGRIND_COMMAND) tests/httpd_test
-
-valgrind-httpd: tests/httpd_test gearmand/gearmand
-	@$(VALGRIND_COMMAND) tests/httpd_test
+t_httpd_SOURCES=
+t_httpd_LDADD=
+
+t_httpd_SOURCES+= tests/httpd_test.cc
+
+t_httpd_LDADD+= $(CLIENT_LDADD)
+
+#check_PROGRAMS+= t/httpd
+noinst_PROGRAMS+= t/httpd
+
+test-httpd: t/httpd gearmand/gearmand
+	@t/httpd
+
+gdb-httpd: t/httpd gearmand/gearmand
+	@$(GDB_COMMAND) tests/httpd
+
+helgrind-httpd: t/httpd gearmand/gearmand
+	@$(HELGRIND_COMMAND) t/httpd
+
+valgrind-httpd: t/httpd gearmand/gearmand
+	@$(VALGRIND_COMMAND) t/httpd

=== modified file 'tests/include.am'
--- tests/include.am	2013-06-27 04:56:49 +0000
+++ tests/include.am	2013-07-03 03:55:32 +0000
@@ -30,77 +30,77 @@
 CLIENT_LDADD+= libtest/libtest.la
 CLIENT_LDADD+= tests/libstartworker.la
 
-tests_cycle_SOURCES=
-tests_cycle_LDADD=
-EXTRA_tests_cycle_DEPENDENCIES=
-
-EXTRA_tests_cycle_DEPENDENCIES+= gearmand/gearmand
-tests_cycle_SOURCES+= tests/cycle.cc
-tests_cycle_LDADD+= ${CLIENT_LDADD}
-check_PROGRAMS+=tests/cycle
-noinst_PROGRAMS+=tests/cycle
-
-tests_blobslap_client_SOURCES=
-tests_blobslap_client_LDADD=
-
-tests_blobslap_client_SOURCES+= tests/blobslap_client.cc
-tests_blobslap_client_LDADD+= ${CLIENT_LDADD}
-noinst_PROGRAMS+= tests/blobslap_client
-
-# Vector tests
-tests_vector_SOURCES=
-tests_vector_LDADD=
-
-tests_vector_SOURCES+= tests/vector.cc
-tests_vector_LDADD+= libtest/libtest.la
-tests_vector_LDADD+= libgearman/libgearman-vector.la
-check_PROGRAMS+= tests/vector
-noinst_PROGRAMS+= tests/vector
-
-test-vector: tests/vector
-	@tests/vector
-
-valgrind-vector: tests/vector
-	@$(VALGRIND_COMMAND) tests/vector
-
-# Vector tests
-tests_result_SOURCES=
-tests_result_LDADD=
-
-tests_result_SOURCES+= tests/result.cc
-tests_result_LDADD+= libtest/libtest.la
-tests_result_LDADD+= libgearman/libgearman-result.la
-check_PROGRAMS+= tests/result
-noinst_PROGRAMS+= tests/result
-
-test-result: tests/result
-	@tests/result
-
-valgrind-result: tests/result
-	@$(VALGRIND_COMMAND) tests/result
-
-
-EXTRA_tests_cli_DEPENDENCIES=
-tests_cli_SOURCES=
-tests_cli_LDADD=
-
-tests_cli_SOURCES+= tests/cli.cc
-EXTRA_tests_cli_DEPENDENCIES+= bin/gearman
-EXTRA_tests_cli_DEPENDENCIES+= bin/gearadmin
-EXTRA_tests_cli_DEPENDENCIES+= gearmand/gearmand
-tests_cli_LDADD+= ${CLIENT_LDADD}
-check_PROGRAMS+= tests/cli
-noinst_PROGRAMS+= tests/cli
-
-EXTRA_tests_gearmand_DEPENDENCIES=
-tests_gearmand_LDADD=
-tests_gearmand_SOURCES=
-
-tests_gearmand_SOURCES+= tests/gearmand.cc
-tests_gearmand_LDADD+= ${CLIENT_LDADD}
-EXTRA_tests_gearmand_DEPENDENCIES+= gearmand/gearmand
-check_PROGRAMS+= tests/gearmand
-noinst_PROGRAMS+= tests/gearmand
+t_cycle_SOURCES=
+t_cycle_LDADD=
+EXTRA_t_cycle_DEPENDENCIES=
+
+EXTRA_t_cycle_DEPENDENCIES+= gearmand/gearmand
+t_cycle_SOURCES+= tests/cycle.cc
+t_cycle_LDADD+= ${CLIENT_LDADD}
+check_PROGRAMS+=t/cycle
+noinst_PROGRAMS+=t/cycle
+
+t_blobslap_client_SOURCES=
+t_blobslap_client_LDADD=
+
+t_blobslap_client_SOURCES+= tests/blobslap_client.cc
+t_blobslap_client_LDADD+= ${CLIENT_LDADD}
+noinst_PROGRAMS+= t/blobslap_client
+
+# Vector tests
+t_vector_SOURCES=
+t_vector_LDADD=
+
+t_vector_SOURCES+= tests/vector.cc
+t_vector_LDADD+= libtest/libtest.la
+t_vector_LDADD+= libgearman/libgearman-vector.la
+check_PROGRAMS+= t/vector
+noinst_PROGRAMS+= t/vector
+
+test-vector: t/vector
+	@t/vector
+
+valgrind-vector: t/vector
+	@$(VALGRIND_COMMAND) t/vector
+
+# Vector tests
+t_result_SOURCES=
+t_result_LDADD=
+
+t_result_SOURCES+= tests/result.cc
+t_result_LDADD+= libtest/libtest.la
+t_result_LDADD+= libgearman/libgearman-result.la
+check_PROGRAMS+= t/result
+noinst_PROGRAMS+= t/result
+
+test-result: t/result
+	@t/result
+
+valgrind-result: t/result
+	@$(VALGRIND_COMMAND) t/result
+
+
+EXTRA_t_cli_DEPENDENCIES=
+t_cli_SOURCES=
+t_cli_LDADD=
+
+t_cli_SOURCES+= tests/cli.cc
+EXTRA_t_cli_DEPENDENCIES+= bin/gearman
+EXTRA_t_cli_DEPENDENCIES+= bin/gearadmin
+EXTRA_t_cli_DEPENDENCIES+= gearmand/gearmand
+t_cli_LDADD+= ${CLIENT_LDADD}
+check_PROGRAMS+= t/cli
+noinst_PROGRAMS+= t/cli
+
+EXTRA_t_gearmand_DEPENDENCIES=
+t_gearmand_LDADD=
+t_gearmand_SOURCES=
+
+t_gearmand_SOURCES+= tests/gearmand.cc
+t_gearmand_LDADD+= ${CLIENT_LDADD}
+EXTRA_t_gearmand_DEPENDENCIES+= gearmand/gearmand
+check_PROGRAMS+= t/gearmand
+noinst_PROGRAMS+= t/gearmand
 
 include tests/libgearman-1.0/include.am
 include tests/stress.am
@@ -108,100 +108,100 @@
 include tests/workers/include.am
 include tests/protocol.mk
 
-tests_round_robin_test_SOURCES=
-tests_round_robin_test_LDADD=
-
-tests_round_robin_test_SOURCES+= tests/round_robin.cc
-tests_round_robin_test_LDADD+= ${CLIENT_LDADD}
-tests_round_robin_test_LDADD+= libgearman/libgearmancore.la
-check_PROGRAMS+= tests/round_robin_test
-noinst_PROGRAMS+= tests/round_robin_test
-
-test-round-robin: tests/round_robin_test gearmand/gearmand
-	@tests/round_robin_test
-
-gdb-round-robin: tests/round_robin_test gearmand/gearmand
-	@$(GDB_COMMAND) tests/round_robin_test
-
-valgrind-round-robin: tests/round_robin_test gearmand/gearmand
-	@$(VALGRIND_COMMAND) tests/round_robin_test
-
-helgrind-round-robin: tests/round_robin_test gearmand/gearmand
-	@$(HELGRIND_COMMAND) tests/round_robin_test
+t_round_robin_SOURCES=
+t_round_robin_LDADD=
+
+t_round_robin_SOURCES+= tests/round_robin.cc
+t_round_robin_LDADD+= ${CLIENT_LDADD}
+t_round_robin_LDADD+= libgearman/libgearmancore.la
+check_PROGRAMS+= t/round_robin
+noinst_PROGRAMS+= t/round_robin
+
+test-round-robin: t/round_robin gearmand/gearmand
+	@t/round_robin
+
+gdb-round-robin: t/round_robin gearmand/gearmand
+	@$(GDB_COMMAND) t/round_robin
+
+valgrind-round-robin: t/round_robin gearmand/gearmand
+	@$(VALGRIND_COMMAND) t/round_robin
+
+helgrind-round-robin: tests/round_robin gearmand/gearmand
+	@$(HELGRIND_COMMAND) t/round_robin
 
 # Test linking with C++ application
-tests_cpp_test_SOURCES=
-tests_cpp_test_LDADD=
-
-tests_cpp_test_SOURCES+= tests/cpp_test.cc
-tests_cpp_test_LDADD+= ${CLIENT_LDADD}
-check_PROGRAMS+=tests/cpp_test
-noinst_PROGRAMS+=tests/cpp_test
-
-valgrind-cpp_test: tests/cpp_test
-	@$(VALGRIND_COMMAND) tests/cpp_test
+t_cpp_SOURCES=
+t_cpp_LDADD=
+
+t_cpp_SOURCES+= tests/cpp_test.cc
+t_cpp_LDADD+= ${CLIENT_LDADD}
+check_PROGRAMS+=t/cpp
+noinst_PROGRAMS+=t/cpp
+
+valgrind-cpp: t/cpp
+	@$(VALGRIND_COMMAND) t/cpp
 
 # Test linking with C application
-tests_c_test_SOURCES=
-tests_c_test_LDADD=
-
-tests_c_test_SOURCES+= tests/c_test.c
-tests_c_test_LDADD+= ${CLIENT_LDADD}
-check_PROGRAMS+=tests/c_test
-noinst_PROGRAMS+=tests/c_test
-
-valgrind-c_test: tests/c_test
-	@$(VALGRIND_COMMAND) tests/c_test
-
-test-cycle: tests/cycle gearmand/gearmand
-	@tests/cycle
-
-test-cli: tests/cli gearmand/gearmand
-	@tests/cli
-
-test-gearmand: tests/gearmand gearmand/gearmand
-	@tests/gearmand
-
-tests-blobslap_client: tests/blobslap_client gearmand/gearmand
-	@tests/blobslap_client
+t_c_SOURCES=
+t_c_LDADD=
+
+t_c_SOURCES+= tests/c_test.c
+t_c_LDADD+= ${CLIENT_LDADD}
+check_PROGRAMS+=t/c
+noinst_PROGRAMS+=t/c
+
+valgrind-c: t/c
+	@$(VALGRIND_COMMAND) t/c
+
+test-cycle: t/cycle gearmand/gearmand
+	@t/cycle
+
+test-cli: t/cli gearmand/gearmand
+	@t/cli
+
+test-gearmand: t/gearmand gearmand/gearmand
+	@t/gearmand
+
+tests-blobslap_client: t/blobslap_client gearmand/gearmand
+	@t/blobslap_client
 
 check-local:
 
-gdb-cli: tests/cli gearmand/gearmand
-	@$(GDB_COMMAND) tests/cli
-
-gdb-blobslap_client: tests/blobslap_client gearmand/gearmand
-	@$(GDB_COMMAND) tests/blobslap_client
-
-gdb-cycle: tests/cycle gearmand/gearmand
-	@$(GDB_COMMAND) tests/cycle
-
-gdb-gearmand: tests/gearmand gearmand/gearmand
-	@$(GDB_COMMAND) tests/gearmand
-
-valgrind-cli: tests/cli gearmand/gearmand
-	@$(VALGRIND_COMMAND) tests/cli
-
-valgrind-burnin: tests/burnin_test gearmand/gearmand
-	@$(VALGRIND_COMMAND) tests/burnin_test
-
-valgrind-cycle: tests/cycle gearmand/gearmand
-	@$(VALGRIND_COMMAND) tests/cycle
-
-valgrind-gearmand: tests/gearmand gearmand/gearmand
-	@$(VALGRIND_COMMAND) tests/gearmand
-
-helgrind-client: tests/client_test gearmand/gearmand
-	@$(HELGRIND_COMMAND) tests/client_test
-
-helgrind-burnin: tests/burnin_test gearmand/gearmand
-	@$(HELGRIND_COMMAND) tests/burnin_test
-
-helgrind-cycle: tests/cycle gearmand/gearmand
-	@$(HELGRIND_COMMAND) tests/cycle
-
-drd-cycle: tests/cycle gearmand/gearmand
-	@$(DRD_COMMAND) tests/cycle
+gdb-cli: t/cli gearmand/gearmand
+	@$(GDB_COMMAND) t/cli
+
+gdb-blobslap_client: t/blobslap_client gearmand/gearmand
+	@$(GDB_COMMAND) t/blobslap_client
+
+gdb-cycle: t/cycle gearmand/gearmand
+	@$(GDB_COMMAND) t/cycle
+
+gdb-gearmand: t/gearmand gearmand/gearmand
+	@$(GDB_COMMAND) t/gearmand
+
+valgrind-cli: t/cli gearmand/gearmand
+	@$(VALGRIND_COMMAND) t/cli
+
+valgrind-burnin: t/burnin_test gearmand/gearmand
+	@$(VALGRIND_COMMAND) t/burnin_test
+
+valgrind-cycle: t/cycle gearmand/gearmand
+	@$(VALGRIND_COMMAND) t/cycle
+
+valgrind-gearmand: t/gearmand gearmand/gearmand
+	@$(VALGRIND_COMMAND) t/gearmand
+
+helgrind-client: t/client gearmand/gearmand
+	@$(HELGRIND_COMMAND) t/client
+
+helgrind-burnin: t/burnin gearmand/gearmand
+	@$(HELGRIND_COMMAND) t/burnin
+
+helgrind-cycle: t/cycle gearmand/gearmand
+	@$(HELGRIND_COMMAND) t/cycle
+
+drd-cycle: t/cycle gearmand/gearmand
+	@$(DRD_COMMAND) t/cycle
 
 include tests/ephemeral.am
 include tests/libdrizzle.am

=== modified file 'tests/libdrizzle.am'
--- tests/libdrizzle.am	2013-01-09 00:23:55 +0000
+++ tests/libdrizzle.am	2013-07-03 03:55:32 +0000
@@ -10,32 +10,32 @@
 # All paths should be given relative to the root
 #
 
-tests_drizzle_test_CXXFLAGS=
-tests_drizzle_test_SOURCES=
-tests_drizzle_test_LDADD=
-tests_drizzle_test_LDFLAGS=
-
-tests_drizzle_test_SOURCES+= tests/basic.cc
-tests_drizzle_test_SOURCES+= tests/drizzle_test.cc
-
-tests_drizzle_test_LDADD+= libgearman/libgearman.la
-tests_drizzle_test_LDADD+= libtest/libtest.la
-tests_drizzle_test_LDADD+= tests/libstartworker.la
-
-tests_drizzle_test_LDFLAGS+= @LIBDRIZZLE_LDFLAGS@
-tests_drizzle_test_LDADD+= @LIBDRIZZLE_LIB@
-
-check_PROGRAMS += tests/drizzle_test
-noinst_PROGRAMS += tests/drizzle_test
-
-test-drizzle: tests/drizzle_test gearmand/gearmand
-	@tests/drizzle_test
-
-gdb-drizzle: tests/drizzle_test gearmand/gearmand
-	@$(GDB_COMMAND) tests/drizzle_test
-
-helgrind-drizzle: tests/drizzle_test gearmand/gearmand
-	@$(HELGRIND_COMMAND) tests/drizzle_test
-
-valgrind-drizzle: tests/drizzle_test gearmand/gearmand
-	@$(VALGRIND_COMMAND) tests/drizzle_test
+t_drizzle_CXXFLAGS=
+t_drizzle_SOURCES=
+t_drizzle_LDADD=
+t_drizzle_LDFLAGS=
+
+t_drizzle_SOURCES+= tests/basic.cc
+t_drizzle_SOURCES+= tests/drizzle_test.cc
+
+t_drizzle_LDADD+= libgearman/libgearman.la
+t_drizzle_LDADD+= libtest/libtest.la
+t_drizzle_LDADD+= tests/libstartworker.la
+
+t_drizzle_LDFLAGS+= @LIBDRIZZLE_LDFLAGS@
+t_drizzle_LDADD+= @LIBDRIZZLE_LIB@
+
+check_PROGRAMS += t/drizzle
+noinst_PROGRAMS += t/drizzle
+
+test-drizzle: t/drizzle gearmand/gearmand
+	@tests/drizzle
+
+gdb-drizzle: t/drizzle gearmand/gearmand
+	@$(GDB_COMMAND) tests/drizzle
+
+helgrind-drizzle: t/drizzle gearmand/gearmand
+	@$(HELGRIND_COMMAND) tests/drizzle
+
+valgrind-drizzle: t/drizzle gearmand/gearmand
+	@$(VALGRIND_COMMAND) tests/drizzle

=== modified file 'tests/libgearman-1.0/include.am'
--- tests/libgearman-1.0/include.am	2013-06-28 19:13:48 +0000
+++ tests/libgearman-1.0/include.am	2013-07-03 03:55:32 +0000
@@ -10,124 +10,124 @@
 LIBGEARMAN_1_0_CLIENT_LDADD+= libtest/libtest.la
 LIBGEARMAN_1_0_CLIENT_LDADD+= tests/libstartworker.la
 
-tests_libgearman_1_0_client_test_CXXFLAGS=
-tests_libgearman_1_0_client_test_SOURCES=
-tests_libgearman_1_0_client_test_LDADD=
-
-tests_libgearman_1_0_client_test_CXXFLAGS+= $(BOOST_CPPFLAGS)
-tests_libgearman_1_0_client_test_CXXFLAGS+= @PTHREAD_CFLAGS@
-tests_libgearman_1_0_client_test_SOURCES+= tests/libgearman-1.0/client_test.cc 
-tests_libgearman_1_0_client_test_SOURCES+= tests/libgearman-1.0/do.cc 
-tests_libgearman_1_0_client_test_SOURCES+= tests/libgearman-1.0/do_background.cc 
-tests_libgearman_1_0_client_test_SOURCES+= tests/libgearman-1.0/execute.cc 
-tests_libgearman_1_0_client_test_SOURCES+= tests/libgearman-1.0/fork.cc
-tests_libgearman_1_0_client_test_SOURCES+= tests/libgearman-1.0/gearman_client_do_job_handle.cc 
-tests_libgearman_1_0_client_test_SOURCES+= tests/libgearman-1.0/gearman_client_job_status_by_unique.cc
-tests_libgearman_1_0_client_test_SOURCES+= tests/libgearman-1.0/gearman_execute_partition.cc 
-tests_libgearman_1_0_client_test_SOURCES+= tests/libgearman-1.0/limits.cc 
-tests_libgearman_1_0_client_test_SOURCES+= tests/libgearman-1.0/protocol.cc 
-tests_libgearman_1_0_client_test_SOURCES+= tests/libgearman-1.0/server_options.cc 
-tests_libgearman_1_0_client_test_SOURCES+= tests/libgearman-1.0/task.cc 
-tests_libgearman_1_0_client_test_SOURCES+= tests/libgearman-1.0/unique.cc 
-tests_libgearman_1_0_client_test_SOURCES+= tests/workers/aggregator/cat.cc
-tests_libgearman_1_0_client_test_SOURCES+= tests/workers/v1/echo_or_react.cc
-tests_libgearman_1_0_client_test_SOURCES+= tests/workers/v1/echo_or_react_chunk.cc
-tests_libgearman_1_0_client_test_SOURCES+= tests/workers/v1/unique.cc
-tests_libgearman_1_0_client_test_SOURCES+= tests/workers/v2/call_exception.cc
-tests_libgearman_1_0_client_test_SOURCES+= tests/workers/v2/echo_or_react.cc
-tests_libgearman_1_0_client_test_SOURCES+= tests/workers/v2/echo_or_react_chunk.cc
-tests_libgearman_1_0_client_test_SOURCES+= tests/workers/v2/sleep_return_random.cc
-tests_libgearman_1_0_client_test_SOURCES+= tests/workers/v2/split.cc
-tests_libgearman_1_0_client_test_SOURCES+= tests/workers/v2/unique.cc
-tests_libgearman_1_0_client_test_LDADD+= ${LIBGEARMAN_1_0_CLIENT_LDADD}
-tests_libgearman_1_0_client_test_LDADD+= @PTHREAD_LIBS@
-check_PROGRAMS+=tests/libgearman-1.0/client_test
-noinst_PROGRAMS+=tests/libgearman-1.0/client_test
-
-tests_libgearman_1_0_multi_client_test_CXXFLAGS=
-tests_libgearman_1_0_multi_client_test_SOURCES=
-tests_libgearman_1_0_multi_client_test_LDADD=
-
-tests_libgearman_1_0_multi_client_test_SOURCES+= tests/libgearman-1.0/multi_client_test.cc 
-tests_libgearman_1_0_multi_client_test_LDADD+= ${LIBGEARMAN_1_0_CLIENT_LDADD}
-check_PROGRAMS+=tests/libgearman-1.0/multi_client_test
-noinst_PROGRAMS+=tests/libgearman-1.0/multi_client_test
-
-test-multi-client: tests/libgearman-1.0/multi_client_test gearmand/gearmand
-	@tests/libgearman-1.0/multi_client_test
-
-gdb-multi-client: tests/libgearman-1.0/multi_client_test gearmand/gearmand
-	@$(GDB_COMMAND) tests/libgearman-1.0/multi_client_test
-
-valgrind-multi-client: tests/libgearman-1.0/multi_client_test gearmand/gearmand
-	@$(VALGRIND_COMMAND) tests/libgearman-1.0/multi_client_test
-
-tests_libgearman_1_0_internals_test_SOURCES=
-tests_libgearman_1_0_internals_test_LDADD=
-
-tests_libgearman_1_0_internals_test_SOURCES+= tests/libgearman-1.0/internals.cc
-tests_libgearman_1_0_internals_test_SOURCES+= tests/libgearman-1.0/regression.cc
-tests_libgearman_1_0_internals_test_LDADD+= ${LIBGEARMAN_1_0_CLIENT_LDADD}
-tests_libgearman_1_0_internals_test_LDADD+= libgearman/libgearmancore.la
-check_PROGRAMS+= tests/libgearman-1.0/internals_test
-noinst_PROGRAMS+= tests/libgearman-1.0/internals_test
-
-tests_libgearman_1_0_worker_test_LDADD=
-tests_libgearman_1_0_worker_test_SOURCES=
-
-tests_libgearman_1_0_worker_test_SOURCES+= tests/libgearman-1.0/worker_test.cc
-tests_libgearman_1_0_worker_test_SOURCES+= tests/workers/v2/call_exception.cc
-tests_libgearman_1_0_worker_test_SOURCES+= tests/workers/v2/echo_or_react.cc
-tests_libgearman_1_0_worker_test_SOURCES+= tests/workers/v2/echo_or_react_chunk.cc
-tests_libgearman_1_0_worker_test_LDADD+= ${LIBGEARMAN_1_0_CLIENT_LDADD}
-tests_libgearman_1_0_worker_test_LDADD+= libgearman/libgearmancore.la
-check_PROGRAMS+=tests/libgearman-1.0/worker_test
-noinst_PROGRAMS+=tests/libgearman-1.0/worker_test
-
-test-internals: tests/libgearman-1.0/internals_test gearmand/gearmand
-	@tests/libgearman-1.0/internals_test
-
-gdb-internals: tests/libgearman-1.0/internals_test gearmand/gearmand
-	@$(GDB_COMMAND) tests/libgearman-1.0/internals_test
-
-helgrind-internals: tests/internals_test gearmand/gearmand
-	@$(HELGRIND_COMMAND) tests/libgearman-1.0/internals_test
-
-
-valgrind-internals: tests/libgearman-1.0/internals_test gearmand/gearmand
-	@$(VALGRIND_COMMAND) tests/libgearman-1.0/internals_test
-
-valgrind-worker: tests/libgearman-1.0/worker_test gearmand/gearmand
-	@$(VALGRIND_COMMAND) tests/libgearman-1.0/worker_test
-
-massif-worker: tests/libgearman-1.0/worker_test gearmand/gearmand
-	@$(MASSIF_COMMAND) tests/libgearman-1.0/worker_test
-
-helgrind-worker: tests/libgearman-1.0/worker_test gearmand/gearmand
-	@$(HELGRIND_COMMAND) tests/libgearman-1.0/worker_test
-
-gdb-worker: tests/libgearman-1.0/worker_test gearmand/gearmand
-	@$(GDB_COMMAND) tests/libgearman-1.0/worker_test
-
-ptrdiff-worker: tests/libgearman-1.0/worker_test gearmand/gearmand
-	@$(PTRCHECK_COMMAND) tests/libgearman-1.0/worker_test
-
-test-worker: tests/libgearman-1.0/worker_test gearmand/gearmand
-	@tests/libgearman-1.0/worker_test
-
-test-client: tests/libgearman-1.0/client_test gearmand/gearmand
-	@tests/libgearman-1.0/client_test
-
-gdb-client: tests/libgearman-1.0/client_test gearmand/gearmand
-	@$(GDB_COMMAND) tests/libgearman-1.0/client_test
-
-valgrind-client: tests/libgearman-1.0/client_test gearmand/gearmand
-	@$(VALGRIND_COMMAND) tests/libgearman-1.0/client_test
-
-tests_libgearman_1_0_1077917_SOURCES= tests/libgearman-1.0/1077917.c
-tests_libgearman_1_0_1077917_LDADD= libgearman/libgearman.la
-check_PROGRAMS+= tests/libgearman-1.0/1077917
-noinst_PROGRAMS+= tests/libgearman-1.0/1077917
-
-valgrind-1077917: tests/libgearman-1.0/1077917
-	@$(VALGRIND_COMMAND) --leak-check=full --show-reachable=yes --track-origins=yes tests/libgearman-1.0/1077917
+t_client_CXXFLAGS=
+t_client_SOURCES=
+t_client_LDADD=
+
+t_client_CXXFLAGS+= $(BOOST_CPPFLAGS)
+t_client_CXXFLAGS+= @PTHREAD_CFLAGS@
+t_client_SOURCES+= tests/libgearman-1.0/client_test.cc 
+t_client_SOURCES+= tests/libgearman-1.0/do.cc 
+t_client_SOURCES+= tests/libgearman-1.0/do_background.cc 
+t_client_SOURCES+= tests/libgearman-1.0/execute.cc 
+t_client_SOURCES+= tests/libgearman-1.0/fork.cc
+t_client_SOURCES+= tests/libgearman-1.0/gearman_client_do_job_handle.cc 
+t_client_SOURCES+= tests/libgearman-1.0/gearman_client_job_status_by_unique.cc
+t_client_SOURCES+= tests/libgearman-1.0/gearman_execute_partition.cc 
+t_client_SOURCES+= tests/libgearman-1.0/limits.cc 
+t_client_SOURCES+= tests/libgearman-1.0/protocol.cc 
+t_client_SOURCES+= tests/libgearman-1.0/server_options.cc 
+t_client_SOURCES+= tests/libgearman-1.0/task.cc 
+t_client_SOURCES+= tests/libgearman-1.0/unique.cc 
+t_client_SOURCES+= tests/workers/aggregator/cat.cc
+t_client_SOURCES+= tests/workers/v1/echo_or_react.cc
+t_client_SOURCES+= tests/workers/v1/echo_or_react_chunk.cc
+t_client_SOURCES+= tests/workers/v1/unique.cc
+t_client_SOURCES+= tests/workers/v2/call_exception.cc
+t_client_SOURCES+= tests/workers/v2/echo_or_react.cc
+t_client_SOURCES+= tests/workers/v2/echo_or_react_chunk.cc
+t_client_SOURCES+= tests/workers/v2/sleep_return_random.cc
+t_client_SOURCES+= tests/workers/v2/split.cc
+t_client_SOURCES+= tests/workers/v2/unique.cc
+t_client_LDADD+= ${LIBGEARMAN_1_0_CLIENT_LDADD}
+t_client_LDADD+= @PTHREAD_LIBS@
+check_PROGRAMS+=t/client
+noinst_PROGRAMS+=t/client
+
+t_multi_client_CXXFLAGS=
+t_multi_client_SOURCES=
+t_multi_client_LDADD=
+
+t_multi_client_SOURCES+= tests/libgearman-1.0/multi_client_test.cc 
+t_multi_client_LDADD+= ${LIBGEARMAN_1_0_CLIENT_LDADD}
+check_PROGRAMS+= t/multi_client
+noinst_PROGRAMS+= t/multi_client
+
+test-multi-client: t/multi_client gearmand/gearmand
+	@t/multi_client
+
+gdb-multi-client: t/multi_client gearmand/gearmand
+	@$(GDB_COMMAND) t/multi_client
+
+valgrind-multi-client: t/multi_client gearmand/gearmand
+	@$(VALGRIND_COMMAND) t/multi_client
+
+t_internals_SOURCES=
+t_internals_LDADD=
+
+t_internals_SOURCES+= tests/libgearman-1.0/internals.cc
+t_internals_SOURCES+= tests/libgearman-1.0/regression.cc
+t_internals_LDADD+= ${LIBGEARMAN_1_0_CLIENT_LDADD}
+t_internals_LDADD+= libgearman/libgearmancore.la
+check_PROGRAMS+= t/internals
+noinst_PROGRAMS+= t/internals
+
+t_worker_LDADD=
+t_worker_SOURCES=
+
+t_worker_SOURCES+= tests/libgearman-1.0/worker_test.cc
+t_worker_SOURCES+= tests/workers/v2/call_exception.cc
+t_worker_SOURCES+= tests/workers/v2/echo_or_react.cc
+t_worker_SOURCES+= tests/workers/v2/echo_or_react_chunk.cc
+t_worker_LDADD+= ${LIBGEARMAN_1_0_CLIENT_LDADD}
+t_worker_LDADD+= libgearman/libgearmancore.la
+check_PROGRAMS+=t/worker
+noinst_PROGRAMS+=t/worker
+
+test-internals: t/internals gearmand/gearmand
+	@t/internals
+
+gdb-internals: t/internals gearmand/gearmand
+	@$(GDB_COMMAND) t/internals
+
+helgrind-internals: t/internals gearmand/gearmand
+	@$(HELGRIND_COMMAND) t/internals
+
+
+valgrind-internals: t/internals gearmand/gearmand
+	@$(VALGRIND_COMMAND) t/internals
+
+valgrind-worker: t/worker gearmand/gearmand
+	@$(VALGRIND_COMMAND) t/worker
+
+massif-worker: t/worker gearmand/gearmand
+	@$(MASSIF_COMMAND) t/worker
+
+helgrind-worker: t/worker gearmand/gearmand
+	@$(HELGRIND_COMMAND) t/worker
+
+gdb-worker: t/libgearman-1.0/worker gearmand/gearmand
+	@$(GDB_COMMAND) t/worker
+
+ptrdiff-worker: t/worker gearmand/gearmand
+	@$(PTRCHECK_COMMAND) t/worker
+
+test-worker: t/worker gearmand/gearmand
+	@t/worker
+
+test-client: t/client gearmand/gearmand
+	@t/client
+
+gdb-client: t/client gearmand/gearmand
+	@$(GDB_COMMAND) t/client
+
+valgrind-client: t/client_test gearmand/gearmand
+	@$(VALGRIND_COMMAND) t/client
+
+t_1077917_SOURCES= tests/libgearman-1.0/1077917.c
+t_1077917_LDADD= libgearman/libgearman.la
+check_PROGRAMS+= t/1077917
+noinst_PROGRAMS+= t/1077917
+
+valgrind-1077917: t/1077917
+	@$(VALGRIND_COMMAND) --leak-check=full --show-reachable=yes --track-origins=yes t/1077917

=== modified file 'tests/libmemcached.am'
--- tests/libmemcached.am	2013-01-14 03:04:28 +0000
+++ tests/libmemcached.am	2013-07-03 03:55:32 +0000
@@ -10,31 +10,31 @@
 # All paths should be given relative to the root
 #
 
-tests_memcached_test_CXXFLAGS=
-tests_memcached_test_SOURCES=
-tests_memcached_test_LDADD=
+t_memcached_CXXFLAGS=
+t_memcached_SOURCES=
+t_memcached_LDADD=
 
-tests_memcached_test_SOURCES+= tests/basic.cc
-tests_memcached_test_SOURCES+= tests/memcached_test.cc
-tests_memcached_test_LDADD+= libgearman/libgearman.la
-tests_memcached_test_LDADD+= libtest/libtest.la
-tests_memcached_test_LDADD+= tests/libstartworker.la
+t_memcached_SOURCES+= tests/basic.cc
+t_memcached_SOURCES+= tests/memcached_test.cc
+t_memcached_LDADD+= libgearman/libgearman.la
+t_memcached_LDADD+= libtest/libtest.la
+t_memcached_LDADD+= tests/libstartworker.la
 
 if HAVE_LIBMEMCACHED
 
-tests_memcached_test_CXXFLAGS+= $(LIBMEMCACHED_CFLAGS)
-tests_memcached_test_LDADD+= $(LIBMEMCACHED_UTIL_LIB)
+t_memcached_CXXFLAGS+= $(LIBMEMCACHED_CFLAGS)
+t_memcached_LDADD+= $(LIBMEMCACHED_UTIL_LIB)
 
 endif
 
-check_PROGRAMS+= tests/memcached_test
-noinst_PROGRAMS+= tests/memcached_test
-
-test-libmemcached: tests/memcached_test gearmand/gearmand
-	@tests/memcached_test  
-
-valgrind-libmemcached: tests/memcached_test gearmand/gearmand
-	@$(VALGRIND_COMMAND) tests/memcached_test  
-
-gdb-libmemcached: tests/memcached_test gearmand/gearmand
-	@$(GDB_COMMAND) tests/memcached_test  
+check_PROGRAMS+= t/memcached
+noinst_PROGRAMS+= t/memcached
+
+test-libmemcached: t/memcached gearmand/gearmand
+	@t/memcached
+
+valgrind-libmemcached: t/memcached gearmand/gearmand
+	@$(VALGRIND_COMMAND) t/memcached
+
+gdb-libmemcached: t/memcached gearmand/gearmand
+	@$(GDB_COMMAND) tests/memcached

=== modified file 'tests/mysql.am'
--- tests/mysql.am	2012-12-17 06:25:48 +0000
+++ tests/mysql.am	2013-07-03 03:55:32 +0000
@@ -9,23 +9,23 @@
 # Included from Top Level Makefile.am
 # All paths should be given relative to the root
 #
-tests_mysql_test_SOURCES=
-tests_mysql_test_CXXFLAGS=
-tests_mysql_test_LDADD=
-
-tests_mysql_test_SOURCES+= tests/basic.cc
-tests_mysql_test_SOURCES+= tests/mysql_test.cc
-
-tests_mysql_test_LDADD+= ${CLIENT_LDADD}
-
-check_PROGRAMS+= tests/mysql_test
-noinst_PROGRAMS+= tests/mysql_test
-
-test-mysql: tests/mysql_test gearmand/gearmand
-	@tests/mysql_test
-
-gdb-mysql: tests/mysql_test gearmand/gearmand
-	@$(GDB_COMMAND) tests/mysql_test
-
-valgrind-mysql: tests/mysql_test gearmand/gearmand
-	@$(VALGRIND_COMMAND) tests/mysql_test
+t_mysql_SOURCES=
+t_mysql_CXXFLAGS=
+t_mysql_LDADD=
+
+t_mysql_SOURCES+= tests/basic.cc
+t_mysql_SOURCES+= tests/mysql_test.cc
+
+t_mysql_LDADD+= ${CLIENT_LDADD}
+
+check_PROGRAMS+= t/mysql
+noinst_PROGRAMS+= t/mysql
+
+test-mysql: t/mysql gearmand/gearmand
+	@t/mysql
+
+gdb-mysql: t/mysql gearmand/gearmand
+	@$(GDB_COMMAND) t/mysql
+
+valgrind-mysql: t/mysql gearmand/gearmand
+	@$(VALGRIND_COMMAND) t/mysql

=== modified file 'tests/postgres.am'
--- tests/postgres.am	2012-12-17 06:25:48 +0000
+++ tests/postgres.am	2013-07-03 03:55:32 +0000
@@ -10,23 +10,23 @@
 # All paths should be given relative to the root
 #
 
-tests_postgres_test_SOURCES=
-tests_postgres_test_CXXFLAGS=
-tests_postgres_test_LDADD=
-
-tests_postgres_test_SOURCES+= tests/basic.cc
-tests_postgres_test_SOURCES+= tests/postgres_test.cc
-
-tests_postgres_test_LDADD+= ${CLIENT_LDADD}
-
-check_PROGRAMS += tests/postgres_test
-noinst_PROGRAMS += tests/postgres_test
-
-test-postgres: tests/postgres_test gearmand/gearmand
-	@tests/postgres_test
-
-gdb-postgres: tests/postgres_test gearmand/gearmand
-	@$(GDB_COMMAND) tests/postgres_test
-
-valgrind-postgres: tests/postgres_test gearmand/gearmand
-	@$(VALGRIND_COMMAND) tests/postgres_test
+t_postgres_SOURCES=
+t_postgres_CXXFLAGS=
+t_postgres_LDADD=
+
+t_postgres_SOURCES+= tests/basic.cc
+t_postgres_SOURCES+= tests/postgres_test.cc
+
+t_postgres_LDADD+= ${CLIENT_LDADD}
+
+check_PROGRAMS += t/postgres
+noinst_PROGRAMS += t/postgres
+
+test-postgres: t/postgres gearmand/gearmand
+	@t/postgres
+
+gdb-postgres: t/postgres gearmand/gearmand
+	@$(GDB_COMMAND) t/postgres
+
+valgrind-postgres: t/postgres gearmand/gearmand
+	@$(VALGRIND_COMMAND) t/postgres

=== modified file 'tests/protocol.mk'
--- tests/protocol.mk	2013-06-27 21:23:13 +0000
+++ tests/protocol.mk	2013-07-03 03:55:32 +0000
@@ -7,21 +7,21 @@
 # Use and distribution licensed under the BSD license.  See
 # the COPYING file in the parent directory for full text.
 
-tests_protocol_SOURCES=
-tests_protocol_LDADD=
-
-tests_protocol_SOURCES+= tests/protocol.cc
-tests_protocol_LDADD+= ${LIBGEARMAN_1_0_CLIENT_LDADD}
-tests_protocol_LDADD+= libgearman/libgearmancore.la
-check_PROGRAMS+= tests/protocol
-noinst_PROGRAMS+= tests/protocol
-
-test-protocol: tests/protocol gearmand/gearmand
-	@tests/protocol
-
-gdb-protocol: tests/protocol gearmand/gearmand
-	@$(GDB_COMMAND) tests/protocol
-
-valgrind-protocol: tests/protocol gearmand/gearmand
-	@$(VALGRIND_COMMAND) tests/protocol
+t_protocol_SOURCES=
+t_protocol_LDADD=
+
+t_protocol_SOURCES+= tests/protocol.cc
+t_protocol_LDADD+= ${LIBGEARMAN_1_0_CLIENT_LDADD}
+t_protocol_LDADD+= libgearman/libgearmancore.la
+check_PROGRAMS+= t/protocol
+noinst_PROGRAMS+= t/protocol
+
+test-protocol: t/protocol gearmand/gearmand
+	@t/protocol
+
+gdb-protocol: t/protocol gearmand/gearmand
+	@$(GDB_COMMAND) t/protocol
+
+valgrind-protocol: t/protocol gearmand/gearmand
+	@$(VALGRIND_COMMAND) t/protocol
 

=== modified file 'tests/redis.am'
--- tests/redis.am	2012-12-17 06:25:48 +0000
+++ tests/redis.am	2013-07-03 03:55:32 +0000
@@ -9,19 +9,19 @@
 # Included from Top Level Makefile.am
 # All paths should be given relative to the root
 #
-tests_redis_test_CXXFLAGS=
-tests_redis_test_SOURCES=
-tests_redis_test_LDADD=
-
-tests_redis_test_LDADD+= ${CLIENT_LDADD}
-tests_redis_test_SOURCES+= tests/basic.cc
-tests_redis_test_SOURCES+= tests/redis.cc
-
-#check_PROGRAMS += tests/redis_test
-noinst_PROGRAMS += tests/redis_test
-
-test-redis: tests/redis_test gearmand/gearmand
-	@tests/redis_test
-
-gdb-redis: tests/redis_test gearmand/gearmand
-	@$(GDB_COMMAND) tests/redis_test
+t_redis_CXXFLAGS=
+t_redis_SOURCES=
+t_redis_LDADD=
+
+t_redis_LDADD+= ${CLIENT_LDADD}
+t_redis_SOURCES+= tests/basic.cc
+t_redis_SOURCES+= tests/redis.cc
+
+#check_PROGRAMS += t/redis
+noinst_PROGRAMS += t/redis
+
+test-redis: tests/redis gearmand/gearmand
+	@tests/redis
+
+gdb-redis: tests/redis gearmand/gearmand
+	@$(GDB_COMMAND) tests/redis

=== modified file 'tests/sqlite.am'
--- tests/sqlite.am	2012-12-17 06:25:48 +0000
+++ tests/sqlite.am	2013-07-03 03:55:32 +0000
@@ -13,29 +13,29 @@
 CLEANFILES+= tests/gearman.sql tests/gearman.sql-journal tests/gearmand.log*
 
 if HAVE_LIBSQLITE3
-tests_sqlite_test_CFLAGS=
-tests_sqlite_test_CXXFLAGS=
-tests_sqlite_test_LDADD=
-tests_sqlite_test_SOURCES=
-
-tests_sqlite_test_CFLAGS+= @SQLITE3_CFLAGS@
-tests_sqlite_test_CXXFLAGS+= @SQLITE3_CFLAGS@
-tests_sqlite_test_LDADD+= @SQLITE3_LDFLAGS@
-tests_sqlite_test_SOURCES+= tests/basic.cc
-tests_sqlite_test_SOURCES+= tests/sqlite_test.cc
-tests_sqlite_test_LDADD+= $(CLIENT_LDADD)
-check_PROGRAMS+= tests/sqlite_test
-noinst_PROGRAMS+= tests/sqlite_test
-
-test-sqlite: tests/sqlite_test gearmand/gearmand
+t_sqlite_CFLAGS=
+t_sqlite_CXXFLAGS=
+t_sqlite_LDADD=
+t_sqlite_SOURCES=
+
+t_sqlite_CFLAGS+= @SQLITE3_CFLAGS@
+t_sqlite_CXXFLAGS+= @SQLITE3_CFLAGS@
+t_sqlite_LDADD+= @SQLITE3_LDFLAGS@
+t_sqlite_SOURCES+= tests/basic.cc
+t_sqlite_SOURCES+= tests/sqlite_test.cc
+t_sqlite_LDADD+= $(CLIENT_LDADD)
+check_PROGRAMS+= t/sqlite
+noinst_PROGRAMS+= t/sqlite
+
+test-sqlite: t/sqlite gearmand/gearmand
 	@tests/sqlite_test
 
-gdb-sqlite: tests/sqlite_test gearmand/gearmand
-	@$(GDB_COMMAND) tests/sqlite_test
-
-helgrind-sqlite: tests/sqlite_test gearmand/gearmand
-	@$(HELGRIND_COMMAND) tests/sqlite_test
-
-valgrind-sqlite: tests/sqlite_test gearmand/gearmand
-	@$(VALGRIND_COMMAND) tests/sqlite_test
+gdb-sqlite: t/sqlite gearmand/gearmand
+	@$(GDB_COMMAND) t/sqlite
+
+helgrind-sqlite: t/sqlite gearmand/gearmand
+	@$(HELGRIND_COMMAND) t/sqlite
+
+valgrind-sqlite: t/sqlite gearmand/gearmand
+	@$(VALGRIND_COMMAND) t/sqlite
 endif

=== modified file 'tests/stress.am'
--- tests/stress.am	2013-05-07 09:45:37 +0000
+++ tests/stress.am	2013-07-03 03:55:32 +0000
@@ -10,23 +10,23 @@
 # All paths should be given relative to the root
 #
 
-tests_stress_CFLAGS=
-tests_stress_CXXFLAGS=
-tests_stress_LDADD=
-tests_stress_SOURCES=
-
-tests_stress_SOURCES+= tests/burnin.cc
-tests_stress_LDADD+= libgearman/libgearman.la
-tests_stress_LDADD+= libtest/libtest.la
-tests_stress_LDADD+= tests/libstartworker.la
-check_PROGRAMS+=tests/stress
-noinst_PROGRAMS+=tests/stress
-
-test-stress: tests/stress gearmand/gearmand
-	@tests/stress
-
-valgrind-stress: tests/stress gearmand/gearmand
-	@$(VALGRIND_COMMAND) tests/stress
-
-gdb-stress: tests/stress gearmand/gearmand
-	@$(GDB_COMMAND) tests/stress
+t_stress_CFLAGS=
+t_stress_CXXFLAGS=
+t_stress_LDADD=
+t_stress_SOURCES=
+
+t_stress_SOURCES+= tests/burnin.cc
+t_stress_LDADD+= libgearman/libgearman.la
+t_stress_LDADD+= libtest/libtest.la
+t_stress_LDADD+= tests/libstartworker.la
+check_PROGRAMS+=t/stress
+noinst_PROGRAMS+=t/stress
+
+test-stress: t/stress gearmand/gearmand
+	@t/stress
+
+valgrind-stress: t/stress gearmand/gearmand
+	@$(VALGRIND_COMMAND) t/stress
+
+gdb-stress: t/stress gearmand/gearmand
+	@$(GDB_COMMAND) t/stress

=== modified file 'tests/tokyocabinet.am'
--- tests/tokyocabinet.am	2012-12-17 06:25:48 +0000
+++ tests/tokyocabinet.am	2013-07-03 03:55:32 +0000
@@ -10,17 +10,17 @@
 # All paths should be given relative to the root
 #
 
-tests_tokyocabinet_test_SOURCES=
-tests_tokyocabinet_test_LDADD=
-
-tests_tokyocabinet_test_LDADD+= $(CLIENT_LDADD)
-tests_tokyocabinet_test_SOURCES+= tests/tokyocabinet_test.cc
-tests_tokyocabinet_test_SOURCES+= tests/basic.cc
-check_PROGRAMS+= tests/tokyocabinet_test
-noinst_PROGRAMS+= tests/tokyocabinet_test
-
-test-tokyocabinet: tests/tokyocabinet_test gearmand/gearmand
-	@tests/tokyocabinet_test
-
-valgrind-tokyocabinet: tests/tokyocabinet_test gearmand/gearmand
-	@$(VALGRIND_COMMAND) tests/tokyocabinet_test
+t_tokyocabinet_SOURCES=
+t_tokyocabinet_LDADD=
+
+t_tokyocabinet_LDADD+= $(CLIENT_LDADD)
+t_tokyocabinet_SOURCES+= tests/tokyocabinet_test.cc
+t_tokyocabinet_SOURCES+= tests/basic.cc
+check_PROGRAMS+= t/tokyocabinet
+noinst_PROGRAMS+= t/tokyocabinet
+
+test-tokyocabinet: t/tokyocabinet gearmand/gearmand
+	@tests/tokyocabinet
+
+valgrind-tokyocabinet: t/tokyocabinet gearmand/gearmand
+	@$(VALGRIND_COMMAND) t/tokyocabinet