X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Finclude.am;h=0ad8da4f6c4d20875a465b67379818beb57b0f64;hb=aa431d73f34773d6a4b7fc104f9bd7ae0384e094;hp=044ca4f8e7bf9e2b8cbcda171936d8cba8c2ca54;hpb=b1e692afdbd3823e57c649fe82e073f3b0743ada;p=m6w6%2Flibmemcached

diff --git a/libtest/include.am b/libtest/include.am
index 044ca4f8..0ad8da4f 100644
--- a/libtest/include.am
+++ b/libtest/include.am
@@ -22,7 +22,7 @@
 
 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 
+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
 
@@ -35,6 +35,9 @@ export GDB_COMMAND
 valgrind:
 	@echo make check TESTS_ENVIRONMENT="\"$(VALGRIND_COMMAND)\""
 
+gdb:
+	@echo make check TESTS_ENVIRONMENT="\"$(GDB_COMMAND)\""
+
 helgrind:
 	@echo make check TESTS_ENVIRONMENT="\"$(HELGRIND_COMMAND)\""
 
@@ -53,6 +56,7 @@ distclean-libtest-check:
 	-rm -rf tmp_chroot
 
 noinst_HEADERS+= \
+		 libtest/binaries.h \
 		 libtest/blobslap_worker.h \
 		 libtest/callbacks.h \
 		 libtest/cmdline.h \
@@ -60,11 +64,16 @@ noinst_HEADERS+= \
 		 libtest/common.h \
 		 libtest/comparison.hpp \
 		 libtest/core.h \
+		 libtest/dream.h \
 		 libtest/error.h \
 		 libtest/failed.h \
 		 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 \
@@ -73,35 +82,48 @@ noinst_HEADERS+= \
 		 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/vchar.hpp \
 		 libtest/visibility.h \
 		 libtest/wait.h
 
 noinst_LTLIBRARIES+= libtest/libtest.la
 libtest_libtest_la_SOURCES= \
+			    libtest/binaries.cc \
 			    libtest/cmdline.cc \
+			    libtest/core.cc \
+			    libtest/dream.cc \
 			    libtest/framework.cc \
+			    libtest/has.cc \
+			    libtest/http.cc \
+			    libtest/is_local.cc \
 			    libtest/killpid.cc \
 			    libtest/libtool.cc \
-			    libtest/runner.cc \
 			    libtest/port.cc \
+			    libtest/runner.cc \
 			    libtest/server.cc \
 			    libtest/server_container.cc \
 			    libtest/signal.cc \
-			    libtest/test.cc
+			    libtest/socket.cc \
+			    libtest/strerror.cc \
+			    libtest/test.cc \
+			    libtest/vchar.cc
 
-libtest_libtest_la_CXXFLAGS= ${AM_CXXFLAGS}
+libtest_libtest_la_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_CXXFLAGS+= $(CURL_CFLAGS)
 libtest_libtest_la_LIBADD=
 libtest_libtest_la_LIBADD+= $(PTHREAD_LIBS)
+libtest_libtest_la_LIBADD+= $(CURL_LIBS)
 libtest_libtest_la_DEPENDENCIES= libtest_tmp_dir
 
 # Declare unittest so that we can append to it
@@ -140,13 +162,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,12 +174,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
-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
 
@@ -182,7 +195,6 @@ 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_LDADD+= libtest/libtest.la
 libtest_unittest_SOURCES= libtest/unittest.cc