Merge in test cleanups.

libtest/test.cc

@@ -383,6 +383,5 @@ cleanup:
 
   Outn(); // Generate a blank to break up the messages if make check/test has been run
 
-  Error << argv[0] << " exit with:" << exit_code;
   return exit_code;
 }

tests/do.cc

@@ -35,7 +35,10 @@
  *
  */
 
-#include <libtest/common.h>
+#include <config.h>
+#include <libtest/test.hpp>
+
+using namespace libtest;
 
 #include <cassert>
 #include <cstring>

tests/drizzle_test.cc

@@ -6,12 +6,15 @@
  * the COPYING file in the parent directory for full text.
  */
 
-#include <libtest/common.h>
+#include <config.h>
+#include <libtest/test.hpp>
 
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+using namespace libtest;
+
+#include <cassert>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <unistd.h>
 
 #include <libgearman/gearman.h>

tests/execute.cc

@@ -35,7 +35,10 @@
  *
  */
 
-#include <libtest/common.h>
+#include <config.h>
+#include <libtest/test.hpp>
+
+using namespace libtest;
 
 #include <cassert>
 #include <cstring>

tests/gearman_client_do_job_handle.cc

@@ -35,7 +35,10 @@
  *
  */
 
-#include <libtest/common.h>
+#include <config.h>
+#include <libtest/test.hpp>
+
+using namespace libtest;
 
 #include <cassert>
 #include <cstring>

tests/gearman_execute_partition.cc

@@ -35,7 +35,10 @@
  *
  */
 
-#include <libtest/common.h>
+#include <config.h>
+#include <libtest/test.hpp>
+
+using namespace libtest;
 
 #include <cassert>
 #include <cstring>

tests/libdrizzle.am

@@ -19,15 +19,15 @@ endif
 
 test-drizzle-queue: gearmand/gearmand
 if HAVE_LIBDRIZZLE
-	$(DRIZZLE_TEST)
+	@tests/drizzle_test
 endif
 
 if HAVE_LIBDRIZZLE
 DRIZZLE_TEST= tests/drizzle_test
-noinst_PROGRAMS+= tests/drizzle_test
 endif
 
 tests_drizzle_test_SOURCES= \
 			    tests/basic.cc \
 			    tests/drizzle_test.cc
 tests_drizzle_test_LDADD= ${CLIENT_LDADD}
+noinst_PROGRAMS+= tests/drizzle_test

tests/libmemcached.am

@@ -22,11 +22,11 @@ tests_memcached_test_SOURCES= \
 			      tests/memcached_test.cc
 tests_memcached_test_LDADD= ${CLIENT_LDADD}
 tests_memcached_test_CXXFLAGS= ${AM_CXXFLAGS}
+noinst_PROGRAMS += tests/memcached_test
 
 if HAVE_LIBMEMCACHED
 if HAVE_MEMCACHED
 check_PROGRAMS += tests/memcached_test
-noinst_PROGRAMS += tests/memcached_test
 endif
 endif
 

tests/memcached_test.cc

@@ -6,7 +6,10 @@
  * the COPYING file in the parent directory for full text.
  */
 
-#include <libtest/common.h>
+#include <config.h>
+#include <libtest/test.hpp>
+
+using namespace libtest;
 
 #include <cassert>
 #include <cstdio>
@@ -16,8 +19,6 @@
 
 #include <libgearman/gearman.h>
 
-#include <libtest/server.h>
-
 #include <tests/basic.h>
 #include <tests/context.h>
 

tests/protocol.cc

@@ -35,7 +35,10 @@
  *
  */
 
-#include <libtest/common.h>
+#include <config.h>
+#include <libtest/test.hpp>
+
+using namespace libtest;
 
 #include <cassert>
 #include <cstring>