Merge in libtest updates.

[m6w6/libmemcached] / libtest / include.am

diff --git a/libtest/include.am b/libtest/include.am
index fb859b665c674f9a735245fbc90dc67166ccfb5e..57d579bad08cbd8b0637cf6cc5ed6e492baffacf 100644 (file)
--- a/libtest/include.am
+++ b/libtest/include.am
@@ -7,34 +7,133 @@
 #
 # included from Top Level Makefile.am
 # All paths should be given relative to the root
-#
+# 
+
+LIBTEST_TMP = ${abs_top_builddir}/tests/var/tmp/
+
+LIBTOOL_COMMAND=$(LIBTOOL) --mode=execute
+VALGRIND_COMMAND= $(LIBTOOL_COMMAND) valgrind --error-exitcode=1 --leak-check=yes --show-reachable=yes --track-fds=yes --malloc-fill=A5 --free-fill=DE
+HELGRIND_COMMAND= $(LIBTOOL_COMMAND) valgrind --tool=helgrind --read-var-info=yes --error-exitcode=1 
+DRD_COMMAND= $(LIBTOOL_COMMAND) valgrind --tool=drd
+GDB_COMMAND= $(LIBTOOL_COMMAND) gdb -f -x libtest/run.gdb
 
-LIBUTEST_TMP = ${abs_top_builddir}/tests/var/tmp/
+export LIBTOOL_COMMAND
+export VALGRIND_COMMAND
+export HELGRIND_COMMAND
+export DRD_COMMAND
+export GDB_COMMAND
+
+EXTRA_DIST+= libtest/run.gdb
 
 CLEANFILES+= \
             tests/var/log/* \
+            tests/var/run/* \
             tests/var/tmp/*
 
 noinst_HEADERS+= \
+                libtest/blobslap_worker.h \
+                libtest/callbacks.h \
+                libtest/cmdline.h \
+                libtest/collection.h \
+                libtest/common.h \
+                libtest/comparison.hpp \
+                libtest/core.h \
+                libtest/error.h \
                 libtest/failed.h \
+                libtest/framework.h \
+                libtest/gearmand.h \
+                libtest/get.h \
+                libtest/killpid.h \
+                libtest/memcached.h \
+                libtest/runner.h \
                 libtest/server.h \
+                libtest/signal.h \
+                libtest/stats.h \
+                libtest/stream.h \
+                libtest/strerror.h \
+                libtest/string.hpp \
                 libtest/test.h \
-                libtest/visibility.h
-
-noinst_LTLIBRARIES+= libtest/libserver.la
-libtest_libserver_la_SOURCES= libtest/server.c
+                libtest/test.hpp \
+                libtest/visibility.h \
+                libtest/wait.h
 
 noinst_LTLIBRARIES+= libtest/libtest.la
-libtest_libtest_la_SOURCES=\
-                          libtest/test.c
-libtest_libtest_la_CFLAGS= ${AM_CFLAGS} ${NO_CONVERSION}
-libtest_libtest_la_CPPFLAGS= ${AM_CPPFLAGS}
+libtest_libtest_la_SOURCES= \
+                           libtest/cmdline.cc \
+                           libtest/framework.cc \
+                           libtest/killpid.cc \
+                           libtest/runner.cc \
+                           libtest/server.cc \
+                           libtest/signal.cc \
+                           libtest/test.cc
+
+libtest_libtest_la_CFLAGS= ${AM_CFLAGS} ${NO_CONVERSION} -DBUILDING_LIBTEST
+libtest_libtest_la_CXXFLAGS= ${AM_CXXFLAGS} ${NO_CONVERSION} -DBUILDING_LIBTEST
+libtest_libtest_la_LIBADD=
+
+LIBTEST_LDADD= libtest/libtest.la
+
+if HAVE_LIBMEMCACHED
+if BUILD_LIBMEMCACHEDUTIL
+LIBTEST_LDADD+= libmemcached/libmemcached.la
+LIBTEST_LDADD+= libmemcached/libmemcachedutil.la
+else
+LIBTEST_LDADD+= $(libmemcached_LIBS)
+endif
+libtest_libtest_la_SOURCES+= libtest/memcached.cc
+endif
+
+if HAVE_LIBGEARMAN
+LIBTEST_LDADD+= libgearman/libgearman.la
+libtest_libtest_la_SOURCES+= libtest/blobslap_worker.cc
+libtest_libtest_la_SOURCES+= libtest/gearmand.cc
+libtest_libtest_la_SOURCES+= util/instance.cc
+libtest_libtest_la_SOURCES+= util/operation.cc
+endif
+
+libtest_tmp_dir: tests/var/log tests/var/tmp tests/var/run clearn-var
+
+clearn-var:
+       @rm -f tests/var/log/*
+       @rm -f tests/var/run/*
+       @rm -f tests/var/tmp/*
+
+tests/var:
+       @$(mkdir_p) tests/var
+
+tests/var/log: tests/var
+       @$(mkdir_p) tests/var/log
+
+tests/var/tmp: tests/var
+       @$(mkdir_p) tests/var/tmp
+
+tests/var/run: tests/var
+       @$(mkdir_p) tests/var/run
+
+.PHONY+= tests/var
+
+
+libtest_unittest_CFLAGS=
+libtest_unittest_LDADD= ${LIBTEST_LDADD}
+libtest_unittest_DEPENDENCIES= ${LIBTEST_LDADD} libtest_tmp_dir
+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
 
-tests/var: tests/var/log tests/var/tmp
-       $(mkdir_p) tests/var
+drd-unittest: libtest/unittest
+       @$(DRD_COMMAND) libtest/unittest
 
-tests/var/log:
-       $(mkdir_p) tests/var/log
+libtest_wait_SOURCES= libtest/wait.cc
+noinst_PROGRAMS+= libtest/wait
 
-tests/var/tmp:
-       $(mkdir_p) tests/var/tmp