Adding gtest framework.

[awesomized/libmemcached] / tests / include.am

diff --git a/tests/include.am b/tests/include.am
index 21450f6df26178039889229c793f144f223fc2c4..3631a81e25713fc083b4b2d24ff9f2b33a3ab866 100644 (file)
--- a/tests/include.am
+++ b/tests/include.am
@@ -10,10 +10,6 @@ DEBUG_COMMAND= $(LIBTOOL) --mode=execute gdb
 
 PAHOLE_COMMAND= $(LIBTOOL) --mode=execute pahole
 
-if HAVE_LIBGTEST
-check_PROGRAMS += tests/unittests
-endif
-
 if BUILD_LIBMEMCACHEDUTIL
 TESTS_LDADDS+= libmemcached/libmemcachedutil.la
 endif
@@ -42,16 +38,10 @@ tests_libserver_la_SOURCES= tests/server.c
 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= \
+                           $(BUILT_SOURCES) \
                            clients/libgenexec.la \
                            tests/libserver.la \
                            tests/libtest.la \
@@ -99,7 +89,7 @@ tests_memplus_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX)
 tests_memplus_DEPENDENCIES = tests/libtest.la tests/libserver.la libmemcached/libmemcached.la
 tests_memplus_LDADD = $(tests_memplus_DEPENDENCIES)
 
-test: test-docs test-mem test-hash memcapable
+test: unittests-run test-docs test-mem test-hash memcapable
        echo "Tests completed"
 
 test-x: test-docs test-plus test-mem test-hash memcapable test-memcat test-memcp test-memrm test-memerror test-memdump test-memflush test-memstat