#
LIBTOOL_COMMAND= ${abs_top_builddir}/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
+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 GDB_COMMAND
valgrind:
- @echo make check TESTS_ENVIRONMENT="\"$(VALGRIND_COMMAND)\""
+ @echo make check TESTS_ENVIRONMENT="\"$(VALGRIND_EXEC_COMMAND)\""
gdb:
@echo make check TESTS_ENVIRONMENT="\"$(GDB_COMMAND)\""
EXTRA_DIST+= libtest/run.gdb
CLEANFILES+= \
+ tmp_chroot/var/drizzle/* \
tmp_chroot/var/log/* \
tmp_chroot/var/run/* \
tmp_chroot/var/tmp/*
libtest/fatal.hpp \
libtest/framework.h \
libtest/gearmand.h \
+ libtest/drizzled.h \
libtest/get.h \
libtest/has.hpp \
libtest/http.hpp \
libtest/wait.h
noinst_LTLIBRARIES+= libtest/libtest.la
-libtest_libtest_la_SOURCES= \
- libtest/binaries.cc \
- libtest/cmdline.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/socket.cc \
- libtest/strerror.cc \
- libtest/test.cc \
- libtest/tmpfile.cc \
- libtest/vchar.cc
libtest_libtest_la_CXXFLAGS=
-libtest_libtest_la_CXXFLAGS+= ${NO_CONVERSION}
+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/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/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=
+
libtest_libtest_la_LIBADD+= $(PTHREAD_LIBS)
libtest_libtest_la_LIBADD+= $(CURL_LIBS)
-libtest_libtest_la_DEPENDENCIES= libtest_tmp_dir
+
+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=
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
endif
endif
-libtest_tmp_dir: tmp_chroot/var/log tmp_chroot/var/tmp tmp_chroot/var/run
+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: 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_tmp_dir libtest/abort libtest/wait
+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
check_PROGRAMS+= libtest/skiptest
noinst_PROGRAMS+= libtest/skiptest
-libtest_wait_SOURCES= libtest/wait.cc
+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