X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Finclude.am;h=a0d5aa040433df53672dfa09521dfd2c89ee3e8c;hb=ad36b6040d85dcd7b2bfb64595a551e4b121178c;hp=ab846b75e1e24584446ada328730712ad0ecff34;hpb=ee71b673a9ce3261cd81723262a8516949388be9;p=m6w6%2Flibmemcached diff --git a/libtest/include.am b/libtest/include.am index ab846b75..a0d5aa04 100644 --- a/libtest/include.am +++ b/libtest/include.am @@ -1,32 +1,16 @@ # vim:ft=automake -# Copyright (C) 2011 Data Differential, http://datadifferential.com/ -# All rights reserved. -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 3 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # # 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 +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 @@ -34,18 +18,34 @@ export HELGRIND_COMMAND 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/drizzle/* \ + 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/timer.hpp noinst_HEADERS+= \ + libtest/binaries.h \ + libtest/cpu.hpp \ libtest/blobslap_worker.h \ libtest/callbacks.h \ libtest/cmdline.h \ @@ -53,52 +53,87 @@ 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/port.h \ libtest/runner.h \ libtest/server.h \ + libtest/server_container.h \ libtest/signal.h \ - libtest/stats.h \ + libtest/socket.hpp \ 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/runner.cc \ - libtest/server.cc \ - libtest/signal.cc \ - libtest/test.cc - -libtest_libtest_la_CFLAGS= ${AM_CFLAGS} -libtest_libtest_la_CFLAGS+= ${NO_CONVERSION} -libtest_libtest_la_CFLAGS+= $(PTHREAD_CFLAGS) -libtest_libtest_la_CFLAGS+= -DBUILDING_LIBTEST -libtest_libtest_la_CPPFLAGS= ${AM_CPPFLAGS} -libtest_libtest_la_CPPFLAGS+= ${NO_CONVERSION} -libtest_libtest_la_CPPFLAGS+= $(PTHREAD_LIBS) -libtest_libtest_la_CPPFLAGS+= -DBUILDING_LIBTEST -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/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_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_LDADD= libtest/libtest.la +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 @@ -107,10 +142,28 @@ 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 -endif +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) -lmemcachedutil +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 @@ -120,7 +173,11 @@ 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_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) @@ -129,25 +186,31 @@ 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 -libtest_tmp_dir: tests/var/log tests/var/tmp tests/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/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_CFLAGS= -libtest_unittest_LDADD= ${LIBTEST_LDADD} -libtest_unittest_DEPENDENCIES= ${LIBTEST_LDADD} 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 noinst_PROGRAMS+= libtest/unittest @@ -155,7 +218,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 @@ -166,5 +229,15 @@ helgrind-unittest: 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