Merge lp:~mordred/gearmand/add-gtest into lp:gearmand/1.0

[Monty Taylor]

adds gtest support

[Monty Taylor (mordred)]

Applied changes from libmemcached.

=== modified file '.bzrignore'
--- .bzrignore	2010-04-04 21:27:36 +0000
+++ .bzrignore	2010-06-30 19:08:26 +0000
@@ -76,3 +76,5 @@
 tests/tokyocabinet_test.res
 tests/worker_test
 tests/worker_test.res
+tests/unittests
+unittests/unittests

=== modified file 'Makefile.am'
--- Makefile.am	2010-01-28 21:37:08 +0000
+++ Makefile.am	2010-06-30 19:08:26 +0000
@@ -17,6 +17,7 @@
 noinst_HEADERS =
 EXTRA_DIST = 
 CLEANFILES =
+TESTS =
 
 
 include benchmark/include.am
@@ -26,10 +27,13 @@
 include libgearman/include.am
 include libgearman-server/include.am
 include tests/include.am
+include unittests/include.am
 include support/include.am
 
 include docs/man_list
 
+TESTS += ${check_PROGRAMS}
+
 EXTRA_DIST+= \
 	docs/Doxyfile.api \
 	docs/Doxyfile.dev \

=== modified file 'configure.ac'
--- configure.ac	2010-06-30 08:35:50 +0000
+++ configure.ac	2010-06-30 19:08:26 +0000
@@ -31,7 +31,7 @@
 PANDORA_REQUIRE_LIBEVENT
 PANDORA_REQUIRE_LIBUUID
 
-
+PANDORA_HAVE_LIBGTEST
 PANDORA_HAVE_BETTER_MALLOC
 PANDORA_HAVE_LIBSQLITE3
 PANDORA_HAVE_LIBDRIZZLE

=== modified file 'tests/include.am'
--- tests/include.am	2010-06-30 02:10:27 +0000
+++ tests/include.am	2010-06-30 19:08:26 +0000
@@ -9,7 +9,6 @@
 noinst_LTLIBRARIES+= tests/libtest.la
 tests_libtest_la_SOURCES= tests/test.c tests/test_gearmand.c
 
-
 VALGRIND_COMMAND= $(LIBTOOL) --mode=execute valgrind --leak-check=yes --show-reachable=yes
 
 TEST_LDADD= \
@@ -17,6 +16,7 @@
 	    libgearman/libgearman.la \
 	    libgearman-server/libgearman-server.la
 
+
 if HAVE_LIBMEMCACHED
 if HAVE_MEMCACHED
 LIBMEMCACHED_PIDFILE = ${abs_top_builddir}/tests/Xumemc.pid

=== added directory 'unittests'
=== added file 'unittests/include.am'
--- unittests/include.am	1970-01-01 00:00:00 +0000
+++ unittests/include.am	2010-06-30 19:08:26 +0000
@@ -0,0 +1,21 @@
+# vim:ft=automake
+# included from Top Level Makefile.am
+# All paths should be given relative to the root
+
+
+if HAVE_LIBGTEST
+check_PROGRAMS += unittests/unittests
+endif
+
+unittests_unittests_SOURCES= \
+			     unittests/main.cc
+
+unittests_unittests_CXXFLAGS= ${AM_CXXFLAGS} ${NO_WERROR}
+unittests_unittests_LDADD= \
+			   libgearman/libgearman.la \
+			   libgearman-server/libgearman-server.la \
+			   ${LTLIBGTEST}
+
+# Shorthand
+unit: check-TESTS
+

=== added file 'unittests/main.cc'
--- unittests/main.cc	1970-01-01 00:00:00 +0000
+++ unittests/main.cc	2010-06-30 19:08:26 +0000
@@ -0,0 +1,21 @@
+/* -*- mode: c; c-basic-offset: 2; indent-tabs-mode: nil; -*-
+ *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ *
+ *  Copyright (C) 2010 Monty Taylor
+ *
+ *  All rights reserved.
+ *
+ *  Use and distribution licensed under the BSD license.  See
+ *  the COPYING file in the parent directory for full text.
+ */
+
+#include "config.h"
+
+#include <gtest/gtest.h>
+
+
+int main(int argc, char **argv)
+{
+  ::testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}