X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Finclude.am;h=d1ede13b2a1bb4278c9a1cd0280b7158f8057c15;hb=a6125e493c92ad44941345da1e123fa6e9b8d272;hp=6d33a694e4a5a7173992460344a8226a65272a21;hpb=91835aac219196d116555e7e0a83fde7393d1d8d;p=awesomized%2Flibmemcached diff --git a/libtest/include.am b/libtest/include.am index 6d33a694..d1ede13b 100644 --- a/libtest/include.am +++ b/libtest/include.am @@ -2,7 +2,7 @@ # # 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 --track-fds=yes --malloc-fill=A5 --free-fill=DE @@ -13,6 +13,7 @@ MASSIF_COMMAND= $(LIBTOOL_COMMAND) valgrind --tool=massif GDB_COMMAND= $(LIBTOOL_COMMAND) gdb -f -x libtest/run.gdb PTRCHECK_COMMAND= $(LIBTOOL_COMMAND) valgrind --tool=exp-ptrcheck --error-exitcode=1 PAHOLE_COMMAND= $(LIBTOOL_COMMAND) --mode=execute pahole +VALGRIND_SUPRESSION= $(LIBTOOL_COMMAND) valgrind --leak-check=full --show-reachable=yes --error-limit=no --gen-suppressions=all --log-file=minimalraw.log export LIBTOOL_COMMAND export VALGRIND_COMMAND @@ -23,6 +24,9 @@ export GDB_COMMAND valgrind: @echo make check TESTS_ENVIRONMENT="\"$(VALGRIND_EXEC_COMMAND)\"" +valgrind-supressions: + @echo make check TESTS_ENVIRONMENT="\"$(VALGRIND_SUPRESSION)\"" + gdb: @echo make check TESTS_ENVIRONMENT="\"$(GDB_COMMAND)\"" @@ -45,51 +49,58 @@ noinst_HEADERS+= libtest/client.hpp noinst_HEADERS+= libtest/formatter.hpp noinst_HEADERS+= libtest/timer.hpp noinst_HEADERS+= libtest/alarm.h -noinst_HEADERS+= libtest/binaries.h -noinst_HEADERS+= libtest/cpu.hpp -noinst_HEADERS+= libtest/blobslap_worker.h -noinst_HEADERS+= libtest/callbacks.h -noinst_HEADERS+= libtest/dns.hpp -noinst_HEADERS+= libtest/cmdline.h -noinst_HEADERS+= libtest/collection.h -noinst_HEADERS+= libtest/common.h -noinst_HEADERS+= libtest/comparison.hpp -noinst_HEADERS+= libtest/core.h -noinst_HEADERS+= libtest/dream.h -noinst_HEADERS+= libtest/error.h -noinst_HEADERS+= libtest/failed.h -noinst_HEADERS+= libtest/fatal.hpp -noinst_HEADERS+= libtest/framework.h -noinst_HEADERS+= libtest/gearmand.h -noinst_HEADERS+= libtest/drizzled.h -noinst_HEADERS+= libtest/get.h -noinst_HEADERS+= libtest/has.hpp -noinst_HEADERS+= libtest/http.hpp -noinst_HEADERS+= libtest/is_pid.hpp -noinst_HEADERS+= libtest/is_local.hpp -noinst_HEADERS+= libtest/killpid.h -noinst_HEADERS+= libtest/libtool.hpp -noinst_HEADERS+= libtest/memcached.h +noinst_HEADERS+= libtest/binaries.h +noinst_HEADERS+= libtest/cpu.hpp +noinst_HEADERS+= libtest/blobslap_worker.h +noinst_HEADERS+= libtest/callbacks.h +noinst_HEADERS+= libtest/dns.hpp +noinst_HEADERS+= libtest/cmdline.h +noinst_HEADERS+= libtest/collection.h +noinst_HEADERS+= libtest/common.h +noinst_HEADERS+= libtest/comparison.hpp +noinst_HEADERS+= libtest/core.h +noinst_HEADERS+= libtest/dream.h +noinst_HEADERS+= libtest/error.h +noinst_HEADERS+= libtest/failed.h +noinst_HEADERS+= libtest/fatal.hpp +noinst_HEADERS+= libtest/framework.h +noinst_HEADERS+= libtest/gearmand.h +noinst_HEADERS+= libtest/drizzled.h +noinst_HEADERS+= libtest/get.h +noinst_HEADERS+= libtest/has.hpp +noinst_HEADERS+= libtest/http.hpp +noinst_HEADERS+= libtest/is_pid.hpp +noinst_HEADERS+= libtest/is_local.hpp +noinst_HEADERS+= libtest/killpid.h +noinst_HEADERS+= libtest/libtool.hpp +noinst_HEADERS+= libtest/memcached.h noinst_HEADERS+= libtest/memcached.hpp noinst_HEADERS+= libtest/poll_error.hpp -noinst_HEADERS+= libtest/port.h -noinst_HEADERS+= libtest/result.hpp -noinst_HEADERS+= libtest/runner.h -noinst_HEADERS+= libtest/server.h -noinst_HEADERS+= libtest/server_container.h -noinst_HEADERS+= libtest/signal.h -noinst_HEADERS+= libtest/socket.hpp -noinst_HEADERS+= libtest/stream.h -noinst_HEADERS+= libtest/strerror.h -noinst_HEADERS+= libtest/string.hpp -noinst_HEADERS+= libtest/test.h -noinst_HEADERS+= libtest/test.hpp +noinst_HEADERS+= libtest/port.h +noinst_HEADERS+= libtest/result.hpp +noinst_HEADERS+= libtest/result/base.hpp +noinst_HEADERS+= libtest/result/fail.hpp +noinst_HEADERS+= libtest/result/fatal.hpp +noinst_HEADERS+= libtest/result/skip.hpp +noinst_HEADERS+= libtest/result/success.hpp +noinst_HEADERS+= libtest/runner.h +noinst_HEADERS+= libtest/server.h +noinst_HEADERS+= libtest/server_container.h +noinst_HEADERS+= libtest/signal.h +noinst_HEADERS+= libtest/socket.hpp +noinst_HEADERS+= libtest/stream.h +noinst_HEADERS+= libtest/strerror.h +noinst_HEADERS+= libtest/string.hpp +noinst_HEADERS+= libtest/test.h +noinst_HEADERS+= libtest/test.hpp noinst_HEADERS+= libtest/thread.hpp -noinst_HEADERS+= libtest/tmpfile.hpp -noinst_HEADERS+= libtest/vchar.hpp -noinst_HEADERS+= libtest/version.h -noinst_HEADERS+= libtest/visibility.h +noinst_HEADERS+= libtest/tmpfile.hpp +noinst_HEADERS+= libtest/lite.h +noinst_HEADERS+= libtest/vchar.hpp +noinst_HEADERS+= libtest/version.h +noinst_HEADERS+= libtest/visibility.h noinst_HEADERS+= libtest/wait.h +noinst_HEADERS+= libtest/yatl.h noinst_LTLIBRARIES+= libtest/libtest.la @@ -97,37 +108,43 @@ libtest_libtest_la_CXXFLAGS= EXTRA_libtest_libtest_la_DEPENDENCIES= libtest_libtest_la_LIBADD= libtest_libtest_la_SOURCES= +if BUILDING_LIBMEMCACHED +libtest_libtest_la_LIBADD+= libmemcached/libmemcached.la +else +libtest_libtest_la_CXXFLAGS+= @LIBMEMCACHED_CFLAGS@ +libtest_libtest_la_LIBADD+= @LIBMEMCACHED_LIB@ +endif -libtest_libtest_la_SOURCES+= libtest/alarm.cc -libtest_libtest_la_SOURCES+= libtest/binaries.cc -libtest_libtest_la_SOURCES+= libtest/cmdline.cc -libtest_libtest_la_SOURCES+= libtest/collection.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/dns.cc -libtest_libtest_la_SOURCES+= libtest/dream.cc -libtest_libtest_la_SOURCES+= libtest/drizzled.cc -libtest_libtest_la_SOURCES+= libtest/fatal.cc -libtest_libtest_la_SOURCES+= libtest/formatter.cc -libtest_libtest_la_SOURCES+= libtest/client.cc -libtest_libtest_la_SOURCES+= libtest/framework.cc -libtest_libtest_la_SOURCES+= libtest/has.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/result.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/alarm.cc +libtest_libtest_la_SOURCES+= libtest/binaries.cc +libtest_libtest_la_SOURCES+= libtest/cmdline.cc +libtest_libtest_la_SOURCES+= libtest/collection.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/dns.cc +libtest_libtest_la_SOURCES+= libtest/dream.cc +libtest_libtest_la_SOURCES+= libtest/drizzled.cc +libtest_libtest_la_SOURCES+= libtest/fatal.cc +libtest_libtest_la_SOURCES+= libtest/formatter.cc +libtest_libtest_la_SOURCES+= libtest/client.cc +libtest_libtest_la_SOURCES+= libtest/framework.cc +libtest_libtest_la_SOURCES+= libtest/has.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/result.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 @@ -140,52 +157,24 @@ libtest_libtest_la_LIBADD+= $(CURL_LIBS) libtest_libtest_la_LIBADD+= @RT_LIB@ EXTRA_libtest_libtest_la_DEPENDENCIES+= libtest_tmp_dir -EXTRA_libtest_libtest_la_DEPENDENCIES+=libtest/abort -EXTRA_libtest_libtest_la_DEPENDENCIES+=libtest/wait +EXTRA_libtest_libtest_la_DEPENDENCIES+= libtest/abort +EXTRA_libtest_libtest_la_DEPENDENCIES+= libtest/wait # Declare unittest so that we can append to it libtest_unittest_CXXFLAGS= libtest_unittest_LDADD= +libtest_libtest_la_LDFLAGS= # We are either building in tree, or with -if BUILDING_LIBMEMCACHED -libtest_libtest_la_LIBADD+= libmemcached/libmemcached.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 -else -if HAVE_LIBMEMCACHED -libtest_libtest_la_LIBADD+= $(LIBMEMCACHED_UTIL_LDFLAGS) -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) +libtest_libtest_la_LDFLAGS+= @LIBDRIZZLE_LDFLAGS@ +libtest_libtest_la_LIBADD+= @LIBDRIZZLE_LIB@ -endif - -if BUILDING_GEARMAN -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 -else -if HAVE_LIBGEARMAN +if BUILDING_GEARMAN 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 TMP_DIR := tmp_chroot/etc tmp_chroot/var/log tmp_chroot/var/tmp tmp_chroot/var/run tmp_chroot/var/drizzle @@ -236,7 +225,7 @@ noinst_PROGRAMS+= libtest/abort libtest_backtrace_SOURCES= libtest_backtrace_LDADD= libtest_backtrace_SOURCES+= libtest/backtrace_test.cc -libtest_backtrace_SOURCES+= libgearman/backtrace.cc +libtest_backtrace_SOURCES+= libmemcached/backtrace.cc libtest_backtrace_LDADD+= @DL_LIB@ noinst_PROGRAMS+= libtest/backtrace test-backtrace: libtest/backtrace