Merge lp:~mordred/libmemcached/add-gtest into lp:~tangent-org/libmemcached/trunk

[Monty Taylor]

Add support for writing unittests using google test.

=== modified file 'Makefile.am'
--- Makefile.am	2010-06-13 16:21:08 +0000
+++ Makefile.am	2010-06-29 17:10:47 +0000
@@ -12,6 +12,7 @@
 noinst_PROGRAMS =
 include_HEADERS =
 nobase_include_HEADERS =
+check_PROGRAMS = 
 EXTRA_HEADERS =
 BUILT_SOURCES=
 EXTRA_DIST= \
@@ -41,6 +42,8 @@
 include example/include.am
 include support/include.am
 
+TESTS += ${check_PROGRAMS}
+
 check-local: test-no-outputdiff
 
 

=== modified file 'configure.ac'
--- configure.ac	2010-06-13 15:01:04 +0000
+++ configure.ac	2010-06-29 17:10:47 +0000
@@ -36,6 +36,7 @@
 
 AC_CHECK_FUNCS([getline])
 
+PANDORA_HAVE_LIBGTEST
 PANDORA_HAVE_LIBEVENT
 PANDORA_REQUIRE_PTHREAD
 PANDORA_CXX_DEMANGLE

=== modified file 'tests/include.am'
--- tests/include.am	2010-06-13 16:43:30 +0000
+++ tests/include.am	2010-06-29 17:10:47 +0000
@@ -10,6 +10,10 @@
 
 PAHOLE_COMMAND= $(LIBTOOL) --mode=execute pahole
 
+if HAVE_LIBGTEST
+check_PROGRAMS += tests/unittests
+endif
+
 if BUILD_LIBMEMCACHEDUTIL
 TESTS_LDADDS+= libmemcached/libmemcachedutil.la
 endif
@@ -38,6 +42,13 @@
 noinst_LTLIBRARIES+= tests/libtest.la
 tests_libtest_la_SOURCES= tests/test.c
 
+tests_unittests_SOURCES= \
+			 tests/main.cc
+tests_unittests_LDADD= \
+		       tests/libserver.la \
+		       libmemcached/libmemcachedinternal.la \
+		       ${TESTS_LDADDS} ${LTLIBGTEST}
+
 tests_testapp_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
 tests_testapp_SOURCES= tests/mem_functions.c
 tests_testapp_DEPENDENCIES= \

=== added file 'tests/main.cc'
--- tests/main.cc	1970-01-01 00:00:00 +0000
+++ tests/main.cc	2010-06-29 17:10:47 +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();
+}