X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Finclude.am;h=6c7e83be5d8e6bd49cbc0e75a0d0da33a0d2c1d0;hb=ffade15f8c3b3fb29d6daf901f931d586da2b3e1;hp=044ca4f8e7bf9e2b8cbcda171936d8cba8c2ca54;hpb=b1e692afdbd3823e57c649fe82e073f3b0743ada;p=m6w6%2Flibmemcached diff --git a/libtest/include.am b/libtest/include.am index 044ca4f8..6c7e83be 100644 --- a/libtest/include.am +++ b/libtest/include.am @@ -21,10 +21,12 @@ # 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 -HELGRIND_COMMAND= $(LIBTOOL_COMMAND) valgrind --tool=helgrind --read-var-info=yes --error-exitcode=1 +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 @@ -33,7 +35,10 @@ export DRD_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)\"" helgrind: @echo make check TESTS_ENVIRONMENT="\"$(HELGRIND_COMMAND)\"" @@ -44,6 +49,7 @@ drd: EXTRA_DIST+= libtest/run.gdb CLEANFILES+= \ + tmp_chroot/var/drizzle/* \ tmp_chroot/var/log/* \ tmp_chroot/var/run/* \ tmp_chroot/var/tmp/* @@ -53,6 +59,8 @@ 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 \ @@ -60,49 +68,81 @@ noinst_HEADERS+= \ 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/runner.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/cmdline.cc \ - libtest/framework.cc \ - libtest/killpid.cc \ - libtest/libtool.cc \ - libtest/runner.cc \ - libtest/port.cc \ - libtest/server.cc \ - libtest/server_container.cc \ - libtest/signal.cc \ - libtest/test.cc - -libtest_libtest_la_CXXFLAGS= ${AM_CXXFLAGS} -libtest_libtest_la_CXXFLAGS+= ${NO_CONVERSION} + +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/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_LIBADD= +libtest_libtest_la_CXXFLAGS+= $(CURL_CFLAGS) + libtest_libtest_la_LIBADD+= $(PTHREAD_LIBS) -libtest_libtest_la_DEPENDENCIES= libtest_tmp_dir +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= @@ -133,6 +173,13 @@ 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 @@ -140,13 +187,10 @@ 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_libtest_la_CXXFLAGS+= -DHAVE_LIBGEARMAN -libtest_libtest_la_CXXFLAGS+= -DGEARMAND_BINARY="\"${abs_top_builddir}/gearmand/gearmand\"" -libtest_libtest_la_CXXFLAGS+= -DGEARMAND_BLOBSLAP_WORKER="\"${abs_top_builddir}/benchmark/blobslap_worker\"" -libtest_unittest_CXXFLAGS+= -DHAVE_LIBGEARMAN 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 @@ -155,16 +199,10 @@ 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 -else -libtest_libtest_la_CXXFLAGS+= -DGEARMAND_BINARY=0 -libtest_libtest_la_CXXFLAGS+= -DGEARMAND_BLOBSLAP_WORKER=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: 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 @@ -178,12 +216,14 @@ tmp_chroot/var/log: tmp_chroot/var 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_CXXFLAGS+= ${AM_CXXFLAGS} -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 @@ -192,7 +232,7 @@ test-unittest: 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 @@ -208,5 +248,10 @@ libtest_skiptest_SOURCES= libtest/skiptest.cc 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 +noinst_PROGRAMS+= libtest/abort