X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Finclude.am;h=a0d5aa040433df53672dfa09521dfd2c89ee3e8c;hb=ad36b6040d85dcd7b2bfb64595a551e4b121178c;hp=a1ed6ede1d298c574d8d094708540ed3dd822825;hpb=e82f6a9bffe896a579ae5013a9cab51180cd003d;p=m6w6%2Flibmemcached

diff --git a/libtest/include.am b/libtest/include.am
index a1ed6ede..a0d5aa04 100644
--- a/libtest/include.am
+++ b/libtest/include.am
@@ -1,52 +1,243 @@
 # vim:ft=automake
-# Copyright (C) 2011 Data Differential (http://datadifferential.com/)
-# All rights reserved.
-#
-# Use and distribution licensed under the BSD license.  See
-# the COPYING file in the parent directory for full text.
 #
 # included from Top Level Makefile.am
 # All paths should be given relative to the root
-#
+# 
+
+LIBTOOL_COMMAND= ${abs_top_builddir}/libtool --mode=execute
+VALGRIND_EXEC_COMMAND= $(LIBTOOL_COMMAND) valgrind --error-exitcode=1 --leak-check=yes --show-reachable=yes --track-fds=yes --malloc-fill=A5 --free-fill=DE
+VALGRIND_COMMAND= TESTS_ENVIRONMENT="valgrind" $(VALGRIND_EXEC_COMMAND)
+HELGRIND_COMMAND= $(LIBTOOL_COMMAND) valgrind --tool=helgrind --read-var-info=yes --error-exitcode=1 --read-var-info=yes
+DRD_COMMAND= $(LIBTOOL_COMMAND) valgrind --tool=drd
+GDB_COMMAND= $(LIBTOOL_COMMAND) gdb -f -x libtest/run.gdb
+PTRCHECK_COMMAND= $(LIBTOOL_COMMAND) valgrind --tool=exp-ptrcheck --error-exitcode=1
+
+export LIBTOOL_COMMAND
+export VALGRIND_COMMAND
+export HELGRIND_COMMAND
+export DRD_COMMAND
+export GDB_COMMAND
+
+valgrind:
+	@echo make check TESTS_ENVIRONMENT="\"$(VALGRIND_EXEC_COMMAND)\""
 
-LIBUTEST_TMP = ${abs_top_builddir}/tests/var/tmp/
+gdb:
+	@echo make check TESTS_ENVIRONMENT="\"$(GDB_COMMAND)\""
+
+helgrind:
+	@echo make check TESTS_ENVIRONMENT="\"$(HELGRIND_COMMAND)\""
+
+drd:
+	@echo make check TESTS_ENVIRONMENT="\"$(DRD_COMMAND)\""
+
+EXTRA_DIST+= libtest/run.gdb
 
 CLEANFILES+= \
-	     tests/var/log/* \
-	     tests/var/tmp/*
+	     tmp_chroot/var/drizzle/* \
+	     tmp_chroot/var/log/* \
+	     tmp_chroot/var/run/* \
+	     tmp_chroot/var/tmp/*
+
+.PHONY: distclean-libtest-check
+distclean-libtest-check:
+	-rm -rf tmp_chroot
 
+noinst_HEADERS+= libtest/timer.hpp
 noinst_HEADERS+= \
+		 libtest/binaries.h \
+		 libtest/cpu.hpp \
+		 libtest/blobslap_worker.h \
 		 libtest/callbacks.h \
+		 libtest/cmdline.h \
 		 libtest/collection.h \
 		 libtest/common.h \
+		 libtest/comparison.hpp \
 		 libtest/core.h \
+		 libtest/dream.h \
 		 libtest/error.h \
 		 libtest/failed.h \
+		 libtest/fatal.hpp \
 		 libtest/framework.h \
+		 libtest/gearmand.h \
+		 libtest/drizzled.h \
 		 libtest/get.h \
+		 libtest/has.hpp \
+		 libtest/http.hpp \
+		 libtest/is_pid.hpp \
+		 libtest/is_local.hpp \
+		 libtest/killpid.h \
+		 libtest/libtool.hpp \
+		 libtest/memcached.h \
+		 libtest/port.h \
 		 libtest/runner.h \
 		 libtest/server.h \
-		 libtest/stats.h \
+		 libtest/server_container.h \
+		 libtest/signal.h \
+		 libtest/socket.hpp \
+		 libtest/stream.h \
 		 libtest/strerror.h \
+		 libtest/string.hpp \
 		 libtest/test.h \
 		 libtest/test.hpp \
-		 libtest/visibility.h
-
-noinst_LTLIBRARIES+= libtest/libserver.la
-libtest_libserver_la_SOURCES= libtest/memcached.cc
+		 libtest/tmpfile.hpp \
+		 libtest/vchar.hpp \
+		 libtest/visibility.h \
+		 libtest/wait.h
 
 noinst_LTLIBRARIES+= libtest/libtest.la
-libtest_libtest_la_SOURCES=\
-			   libtest/framework.cc \
-			   libtest/test.cc
-libtest_libtest_la_CFLAGS= ${AM_CFLAGS} ${NO_CONVERSION} -DBUILDING_LIBTEST
-libtest_libtest_la_CPPFLAGS= ${AM_CPPFLAGS}
 
-tests/var: tests/var/log tests/var/tmp
-	$(mkdir_p) tests/var
+libtest_libtest_la_CXXFLAGS=
+libtest_libtest_la_DEPENDENCIES=
+libtest_libtest_la_LIBADD=
+libtest_libtest_la_SOURCES=
+
+libtest_libtest_la_SOURCES+= libtest/binaries.cc 
+libtest_libtest_la_SOURCES+= libtest/cmdline.cc 
+libtest_libtest_la_SOURCES+= libtest/comparison.cc 
+libtest_libtest_la_SOURCES+= libtest/collection.cc 
+libtest_libtest_la_SOURCES+= libtest/core.cc 
+libtest_libtest_la_SOURCES+= libtest/cpu.cc 
+libtest_libtest_la_SOURCES+= libtest/dream.cc 
+libtest_libtest_la_SOURCES+= libtest/fatal.cc 
+libtest_libtest_la_SOURCES+= libtest/framework.cc 
+libtest_libtest_la_SOURCES+= libtest/has.cc 
+libtest_libtest_la_SOURCES+= libtest/drizzled.cc 
+libtest_libtest_la_SOURCES+= libtest/http.cc 
+libtest_libtest_la_SOURCES+= libtest/is_local.cc 
+libtest_libtest_la_SOURCES+= libtest/killpid.cc 
+libtest_libtest_la_SOURCES+= libtest/libtool.cc 
+libtest_libtest_la_SOURCES+= libtest/main.cc 
+libtest_libtest_la_SOURCES+= libtest/port.cc 
+libtest_libtest_la_SOURCES+= libtest/runner.cc 
+libtest_libtest_la_SOURCES+= libtest/server.cc 
+libtest_libtest_la_SOURCES+= libtest/server_container.cc 
+libtest_libtest_la_SOURCES+= libtest/signal.cc 
+libtest_libtest_la_SOURCES+= libtest/socket.cc 
+libtest_libtest_la_SOURCES+= libtest/strerror.cc 
+libtest_libtest_la_SOURCES+= libtest/timer.cc 
+libtest_libtest_la_SOURCES+= libtest/tmpfile.cc 
+libtest_libtest_la_SOURCES+= libtest/vchar.cc
+
+libtest_libtest_la_CXXFLAGS+= -DBUILDING_LIBTEST
+libtest_libtest_la_CXXFLAGS+= $(PTHREAD_CFLAGS)
+libtest_libtest_la_CXXFLAGS+= -DLIBTEST_TEMP="\"tmp_chroot\""
+libtest_libtest_la_CXXFLAGS+= $(CURL_CFLAGS)
+
+libtest_libtest_la_LIBADD+= $(PTHREAD_LIBS)
+libtest_libtest_la_LIBADD+= $(CURL_LIBS)
+
+libtest_libtest_la_DEPENDENCIES+= libtest_tmp_dir
+libtest_libtest_la_DEPENDENCIES+=libtest/abort
+libtest_libtest_la_DEPENDENCIES+=libtest/wait
+
+# Declare unittest so that we can append to it
+libtest_unittest_CXXFLAGS=
+libtest_unittest_LDADD=
+libtest_unittest_DEPENDENCIES=
+
+# We are either building in tree, or with
+if BUILDING_LIBMEMCACHED
+libtest_libtest_la_DEPENDENCIES+= libmemcached/libmemcached.la
+libtest_libtest_la_DEPENDENCIES+= libmemcached/libmemcachedutil.la
+libtest_libtest_la_LIBADD+= libmemcached/libmemcached.la
+libtest_libtest_la_LIBADD+= libmemcached/libmemcachedutil.la
+libtest_libtest_la_SOURCES+= libtest/memcached.cc
+libtest_libtest_la_CXXFLAGS+= -DHAVE_LIBMEMCACHED
+
+libtest_unittest_CXXFLAGS+= -DHAVE_LIBMEMCACHED
+libtest_unittest_LDADD+= libmemcached/libmemcached.la
+libtest_unittest_LDADD+= libmemcached/libmemcachedutil.la
+libtest_unittest_DEPENDENCIES+= libmemcached/libmemcached.la
+libtest_unittest_DEPENDENCIES+= libmemcached/libmemcachedutil.la
+else
+if HAVE_LIBMEMCACHED
+libtest_libtest_la_LIBADD+= $(libmemcached_LIBS)
+libtest_libtest_la_SOURCES+= libtest/memcached.cc
+else
+libtest_libtest_la_CXXFLAGS+= -DHAVE_LIBMEMCACHED=0
+libtest_unittest_CXXFLAGS+= -DHAVE_LIBMEMCACHED=0
+endif
+endif
+
+if HAVE_LIBDRIZZLE
+
+libtest_libtest_la_LIBADD+= $(libdrizzle_LIBS)
+libtest_libtest_la_CXXFLAGS+= $(libdrizzle_CFLAGS)
+
+endif
+
+if BUILDING_GEARMAN
+libtest_libtest_la_DEPENDENCIES+= libgearman/libgearman.la
+libtest_libtest_la_LIBADD+= 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
+
+libtest_unittest_LDADD+= libgearman/libgearman.la
+libtest_unittest_DEPENDENCIES+= libgearman/libgearman.la
+libtest_unittest_DEPENDENCIES+= gearmand/gearmand
+else
+if HAVE_LIBGEARMAN
+libtest_libtest_la_DEPENDENCIES+= libgearman/libgearman.la
+libtest_libtest_la_LIBADD+= $(libgearman_LIBS)
+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
+endif
+
+libtest_tmp_dir: tmp_chroot/var/log tmp_chroot/var/tmp tmp_chroot/var/run tmp_chroot/var/drizzle
+
+tmp_chroot:
+	@$(mkdir_p) tmp_chroot
+
+tmp_chroot/var: tmp_chroot
+	@$(mkdir_p) tmp_chroot/var
+
+tmp_chroot/var/log: tmp_chroot/var
+	@$(mkdir_p) tmp_chroot/var/log
+
+tmp_chroot/var/tmp: tmp_chroot/var
+	@$(mkdir_p) tmp_chroot/var/tmp
+
+tmp_chroot/var/drizzle: tmp_chroot/var
+	@$(mkdir_p) tmp_chroot/var/drizzle
+
+tmp_chroot/var/run: tmp_chroot/var
+	@$(mkdir_p) tmp_chroot/var/run
+
+
+libtest_unittest_DEPENDENCIES+= libtest/libtest.la
+libtest_unittest_LDADD+= libtest/libtest.la
+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 TESTS_ENVIRONMENT="valgrind"
+
+gdb-unittest: libtest/unittest
+	@$(GDB_COMMAND) libtest/unittest
+
+helgrind-unittest: libtest/unittest
+	@$(HELGRIND_COMMAND) libtest/unittest
+
+drd-unittest: libtest/unittest
+	@$(DRD_COMMAND) libtest/unittest
+
+libtest_skiptest_LDADD= libtest/libtest.la
+libtest_skiptest_SOURCES= libtest/skiptest.cc
+check_PROGRAMS+= libtest/skiptest
+noinst_PROGRAMS+= libtest/skiptest
 
-tests/var/log:
-	$(mkdir_p) tests/var/log
+libtest_wait_SOURCES=
+libtest_wait_SOURCES+= libtest/wait.cc
+libtest_wait_SOURCES+= libtest/dream.cc
+noinst_PROGRAMS+= libtest/wait
 
-tests/var/tmp:
-	$(mkdir_p) tests/var/tmp
+libtest_abort_SOURCES= libtest/abort.cc
+noinst_PROGRAMS+= libtest/abort