X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Finclude.am;h=59706ad8aaf30e8629f767b40b96272e27dc188f;hb=983523c4536f12781533124cb8a00a4291b8cf79;hp=a668d69034104ff495efd2243f20df511b88d0d4;hpb=1825425e12755baebb754a9c4a4df69e3cea0bc9;p=m6w6%2Flibmemcached

diff --git a/libtest/include.am b/libtest/include.am
index a668d690..59706ad8 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
+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,7 @@ 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)\""
@@ -57,6 +59,7 @@ distclean-libtest-check:
 
 noinst_HEADERS+= \
 		 libtest/binaries.h \
+		 libtest/cpu.hpp \
 		 libtest/blobslap_worker.h \
 		 libtest/callbacks.h \
 		 libtest/cmdline.h \
@@ -64,18 +67,22 @@ 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/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 \
@@ -86,6 +93,8 @@ noinst_HEADERS+= \
 		 libtest/string.hpp \
 		 libtest/test.h \
 		 libtest/test.hpp \
+		 libtest/tmpfile.hpp \
+		 libtest/vchar.hpp \
 		 libtest/visibility.h \
 		 libtest/wait.h
 
@@ -93,8 +102,14 @@ noinst_LTLIBRARIES+= libtest/libtest.la
 libtest_libtest_la_SOURCES= \
 			    libtest/binaries.cc \
 			    libtest/cmdline.cc \
+			    libtest/comparison.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 \
@@ -105,16 +120,26 @@ libtest_libtest_la_SOURCES= \
 			    libtest/signal.cc \
 			    libtest/socket.cc \
 			    libtest/strerror.cc \
-			    libtest/test.cc
+			    libtest/test.cc \
+			    libtest/tmpfile.cc \
+			    libtest/vchar.cc
+
+libtest_libtest_la_CXXFLAGS=
+libtest_libtest_la_DEPENDENCIES=
+libtest_libtest_la_LIBADD=
 
-libtest_libtest_la_CXXFLAGS= ${AM_CXXFLAGS}
 libtest_libtest_la_CXXFLAGS+= ${NO_CONVERSION}
 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=
@@ -152,10 +177,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+= -DGEARMAND_BLOBSLAP_WORKER="\"${abs_top_builddir}/benchmark/blobslap_worker\""
 
 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
@@ -164,9 +189,6 @@ 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+= -DGEARMAND_BLOBSLAP_WORKER=0
-else
-libtest_libtest_la_CXXFLAGS+= -DGEARMAND_BLOBSLAP_WORKER=0
 endif
 endif
 
@@ -188,8 +210,7 @@ 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
@@ -198,7 +219,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
@@ -214,5 +235,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