# 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
+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
export DRD_COMMAND
export GDB_COMMAND
+valgrind:
+ @echo make check TESTS_ENVIRONMENT="\"$(VALGRIND_EXEC_COMMAND)\""
+
+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/run/* \
- tests/var/tmp/*
+ tmp_chroot/var/log/* \
+ tmp_chroot/var/run/* \
+ tmp_chroot/var/tmp/*
-.PHONY: distclean-tests-check
-distclean-tests-check:
- -rm -rf tests/var
+.PHONY: distclean-libtest-check
+distclean-libtest-check:
+ -rm -rf tmp_chroot
noinst_HEADERS+= \
+ libtest/binaries.h \
+ libtest/cpu.hpp \
libtest/blobslap_worker.h \
libtest/callbacks.h \
libtest/cmdline.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/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/server_container.h \
libtest/signal.h \
+ libtest/socket.hpp \
libtest/stats.h \
libtest/stream.h \
libtest/strerror.h \
libtest/string.hpp \
libtest/test.h \
libtest/test.hpp \
+ libtest/tmpfile.hpp \
+ libtest/vchar.hpp \
libtest/visibility.h \
libtest/wait.h
noinst_LTLIBRARIES+= libtest/libtest.la
libtest_libtest_la_SOURCES= \
+ libtest/binaries.cc \
libtest/cmdline.cc \
+ libtest/comparison.cc \
+ libtest/core.cc \
+ libtest/cpu.cc \
+ libtest/dream.cc \
+ libtest/fatal.cc \
libtest/framework.cc \
+ libtest/has.cc \
+ libtest/http.cc \
+ libtest/is_local.cc \
libtest/killpid.cc \
+ libtest/libtool.cc \
+ libtest/port.cc \
libtest/runner.cc \
libtest/server.cc \
+ libtest/server_container.cc \
libtest/signal.cc \
- libtest/test.cc
+ libtest/socket.cc \
+ libtest/strerror.cc \
+ libtest/test.cc \
+ libtest/tmpfile.cc \
+ libtest/vchar.cc
+
+libtest_libtest_la_CXXFLAGS=
+libtest_libtest_la_DEPENDENCIES=
+libtest_libtest_la_LIBADD=
-libtest_libtest_la_CXXFLAGS= ${AM_CXXFLAGS}
libtest_libtest_la_CXXFLAGS+= ${NO_CONVERSION}
libtest_libtest_la_CXXFLAGS+= -DBUILDING_LIBTEST
libtest_libtest_la_CXXFLAGS+= $(PTHREAD_CFLAGS)
-libtest_libtest_la_LIBADD=
+libtest_libtest_la_CXXFLAGS+= -DLIBTEST_TEMP="\"tmp_chroot\""
+libtest_libtest_la_CXXFLAGS+= $(CURL_CFLAGS)
+
libtest_libtest_la_LIBADD+= $(PTHREAD_LIBS)
-libtest_libtest_la_DEPENDENCIES=
+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
-libtest_unittest_CXXFLAGS= ${AM_CXXFLAGS}
+# Declare unittest so that we can append to it
+libtest_unittest_CXXFLAGS=
libtest_unittest_LDADD=
libtest_unittest_DEPENDENCIES=
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) -lmemcachedutil
+libtest_libtest_la_LIBADD+= $(libmemcached_LIBS)
libtest_libtest_la_SOURCES+= libtest/memcached.cc
else
libtest_libtest_la_CXXFLAGS+= -DHAVE_LIBMEMCACHED=0
libtest_libtest_la_SOURCES+= libtest/gearmand.cc
libtest_libtest_la_SOURCES+= util/instance.cc
libtest_libtest_la_SOURCES+= util/operation.cc
-libtest_libtest_la_CXXFLAGS+= -DHAVE_LIBGEARMAN
-libtest_libtest_la_CXXFLAGS+= -DGEARMAND_BINARY="gearmand/gearmand"
-libtest_unittest_CXXFLAGS+= -DHAVE_LIBGEARMAN
-libtest_unittest_CXXFLAGS+= -DGEARMAND_BINARY="gearmand/gearmand"
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_SOURCES+= libtest/gearmand.cc
libtest_libtest_la_SOURCES+= util/instance.cc
libtest_libtest_la_SOURCES+= util/operation.cc
-else
-libtest_libtest_la_CXXFLAGS+= -DGEARMAND_BINARY=0
-libtest_libtest_la_CXXFLAGS+= -DHAVE_LIBGEARMAN=0
-libtest_unittest_CXXFLAGS+= -DGEARMAND_BINARY=0
-libtest_unittest_CXXFLAGS+= -DHAVE_LIBGEARMAN=0
endif
endif
-libtest_tmp_dir: tests/var/log tests/var/tmp tests/var/run
+libtest_tmp_dir: tmp_chroot/var/log tmp_chroot/var/tmp tmp_chroot/var/run
+
+tmp_chroot:
+ @$(mkdir_p) tmp_chroot
-tests/var:
- @$(mkdir_p) tests/var
+tmp_chroot/var: tmp_chroot
+ @$(mkdir_p) tmp_chroot/var
-tests/var/log: tests/var
- @$(mkdir_p) tests/var/log
+tmp_chroot/var/log: tmp_chroot/var
+ @$(mkdir_p) tmp_chroot/var/log
-tests/var/tmp: tests/var
- @$(mkdir_p) tests/var/tmp
+tmp_chroot/var/tmp: tmp_chroot/var
+ @$(mkdir_p) tmp_chroot/var/tmp
-tests/var/run: tests/var
- @$(mkdir_p) tests/var/run
+tmp_chroot/var/run: tmp_chroot/var
+ @$(mkdir_p) tmp_chroot/var/run
-libtest_unittest_DEPENDENCIES+= libtest/libtest.la libtest_tmp_dir
+libtest_unittest_DEPENDENCIES+= libtest/libtest.la
libtest_unittest_LDADD+= libtest/libtest.la
libtest_unittest_SOURCES= libtest/unittest.cc
check_PROGRAMS+= libtest/unittest
@libtest/unittest
valgrind-unittest: libtest/unittest
- @$(VALGRIND_COMMAND) libtest/unittest
+ @$(VALGRIND_COMMAND) libtest/unittest TESTS_ENVIRONMENT="valgrind"
gdb-unittest: libtest/unittest
@$(GDB_COMMAND) libtest/unittest
drd-unittest: libtest/unittest
@$(DRD_COMMAND) libtest/unittest
-libtest_wait_SOURCES= libtest/wait.cc
+libtest_skiptest_LDADD= libtest/libtest.la
+libtest_skiptest_SOURCES= libtest/skiptest.cc
+check_PROGRAMS+= libtest/skiptest
+noinst_PROGRAMS+= libtest/skiptest
+
+libtest_wait_SOURCES=
+libtest_wait_SOURCES+= libtest/wait.cc
+libtest_wait_SOURCES+= libtest/dream.cc
noinst_PROGRAMS+= libtest/wait
+
+libtest_abort_SOURCES= libtest/abort.cc
+noinst_PROGRAMS+= libtest/abort