X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Finclude.am;h=77d199df11522647c4cacb4972d1df61a9dc01ed;hb=d4e30bfef1ac602f80dcaf9c3dc0934a57be5de2;hp=fe43701fac5b9ec132bb8429f63bdda37f3604cb;hpb=fde9567090d20b035433241720f00cfbe6e66bf2;p=awesomized%2Flibmemcached

diff --git a/libtest/include.am b/libtest/include.am
index fe43701f..77d199df 100644
--- a/libtest/include.am
+++ b/libtest/include.am
@@ -2,35 +2,45 @@
 #
 # 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
-VALGRIND_COMMAND= TESTS_ENVIRONMENT="valgrind" $(VALGRIND_EXEC_COMMAND)
+VALGRIND_EXEC_COMMAND= $(LIBTOOL_COMMAND) valgrind --tool=memcheck --error-exitcode=1 --leak-check=yes --track-fds=yes --malloc-fill=A5 --free-fill=DE
+SGCHECK_EXEC_COMMAND= $(LIBTOOL_COMMAND) valgrind --tool=exp-sgcheck --error-exitcode=1
+VALGRIND_COMMAND= LOG_COMPILER="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
+DRD_COMMAND= $(LIBTOOL_COMMAND) valgrind --tool=drd --free-is-write=yes --error-exitcode=1
+SGCHECK_COMMAND= $(LIBTOOL_COMMAND) valgrind --tool=exp-sgcheck --error-exitcode=1
 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
 export HELGRIND_COMMAND
 export DRD_COMMAND
+export SGCHECK_COMMAND
 export GDB_COMMAND
 
 valgrind:
-	@echo make check TESTS_ENVIRONMENT="\"$(VALGRIND_EXEC_COMMAND)\""
+	@echo make check LOG_COMPILER="\"$(VALGRIND_EXEC_COMMAND)\""
+
+sgcheck:
+	@echo make check LOG_COMPILER="\"$(SGCHECK_EXEC_COMMAND)\""
+
+valgrind-supressions:
+	@echo make check LOG_COMPILER="\"$(VALGRIND_SUPRESSION)\""
 
 gdb:
-	@echo make check TESTS_ENVIRONMENT="\"$(GDB_COMMAND)\""
+	@echo make check LOG_COMPILER="\"$(GDB_COMMAND)\""
 
 helgrind:
-	@echo make check TESTS_ENVIRONMENT="\"$(HELGRIND_COMMAND)\""
+	@echo make check LOG_COMPILER="\"$(HELGRIND_COMMAND)\""
 
 drd:
-	@echo make check TESTS_ENVIRONMENT="\"$(DRD_COMMAND)\""
+	@echo make check LOG_COMPILER="\"$(DRD_COMMAND)\""
 
 EXTRA_DIST+= libtest/run.gdb
 EXTRA_DIST+= libtest/version.h
@@ -45,89 +55,98 @@ 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/exception.hpp
+noinst_HEADERS+= libtest/exception/disconnected.hpp
+noinst_HEADERS+= libtest/exception/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/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/valgrind.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
+check_LTLIBRARIES+= libtest/libtest.la
 
 libtest_libtest_la_CXXFLAGS=
-libtest_libtest_la_DEPENDENCIES=
+EXTRA_libtest_libtest_la_DEPENDENCIES=
 libtest_libtest_la_LIBADD=
 libtest_libtest_la_SOURCES=
 
-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/exception.cc
+libtest_libtest_la_SOURCES+= libtest/exception/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
@@ -139,61 +158,35 @@ libtest_libtest_la_LIBADD+= @PTHREAD_LIBS@
 libtest_libtest_la_LIBADD+= $(CURL_LIBS)
 libtest_libtest_la_LIBADD+= @RT_LIB@
 
-libtest_libtest_la_DEPENDENCIES+= libtest_tmp_dir
-libtest_libtest_la_DEPENDENCIES+=libtest/abort
-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_unittest_DEPENDENCIES=
+libtest_libtest_la_LDFLAGS=
 
 # We are either building in tree, or with
-if BUILDING_LIBMEMCACHED
-libtest_libtest_la_SOURCES+= libtest/memcached.cc
-libtest_libtest_la_CXXFLAGS+= -DHAVE_LIBMEMCACHED
-
-libtest_unittest_CXXFLAGS+= -DHAVE_LIBMEMCACHED
-else
-if HAVE_LIBMEMCACHED
 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_DEPENDENCIES+= gearmand/gearmand
-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
 
-.PHONY: libtest_tmp_dir
-libtest_tmp_dir: | $(TMP_DIR)
+BUILT_SOURCES+= $(TMP_DIR)
 
 $(TMP_DIR):
 	@$(mkdir_p) $(TMP_DIR)
 
-libtest_unittest_DEPENDENCIES+= libtest/libtest.la
 libtest_unittest_LDADD+= libtest/libtest.la
 libtest_unittest_SOURCES= libtest/unittest.cc
 check_PROGRAMS+= libtest/unittest
@@ -213,11 +206,27 @@ helgrind-unittest: libtest/unittest
 drd-unittest: libtest/unittest
 	@$(DRD_COMMAND) libtest/unittest
 
+sgcheck-unittest: libtest/unittest
+	echo $(SGCHECK_COMMAND)
+	@$(SGCHECK_COMMAND) libtest/unittest
+
 libtest_skiptest_LDADD= libtest/libtest.la
 libtest_skiptest_SOURCES= libtest/skiptest.cc
 check_PROGRAMS+= libtest/skiptest
 noinst_PROGRAMS+= libtest/skiptest
 
+test-skiptest: libtest/skiptest
+	@libtest/skiptest
+
+valgrind-skiptest: libtest/skiptest
+	@$(VALGRIND_COMMAND) libtest/skiptest
+
+helgrind-skiptest: libtest/skiptest
+	@$(HELGRIND_COMMAND) libtest/skiptest
+
+drd-skiptest: libtest/skiptest
+	@$(DRD_COMMAND) libtest/skiptest
+
 libtest_wait_SOURCES=
 libtest_wait_SOURCES+= libtest/wait.cc
 libtest_wait_SOURCES+= libtest/dream.cc
@@ -235,7 +244,7 @@ libtest_backtrace_SOURCES=
 libtest_backtrace_LDADD=
 libtest_backtrace_SOURCES+= libtest/backtrace_test.cc
 libtest_backtrace_SOURCES+= libmemcached/backtrace.cc
-libtest_backtrace_LDADD+= @DL_LIB@
+libtest_backtrace_LDADD+= @lt_cv_dlopen_libs@
 noinst_PROGRAMS+= libtest/backtrace
 test-backtrace: libtest/backtrace
 	@libtest/backtrace