MErge

[m6w6/libmemcached] / libtest / include.am

diff --git a/libtest/include.am b/libtest/include.am
index d7394fd090c9e78ccabc092322acf611bcfe2250..a52c573aac473818f39aa7660bbf845a75170209 100644 (file)
--- 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
 
@@ -53,6 +53,7 @@ distclean-libtest-check:
        -rm -rf tmp_chroot
 
 noinst_HEADERS+= \
+                libtest/binaries.h \
                 libtest/blobslap_worker.h \
                 libtest/callbacks.h \
                 libtest/cmdline.h \
@@ -65,13 +66,17 @@ noinst_HEADERS+= \
                 libtest/framework.h \
                 libtest/gearmand.h \
                 libtest/get.h \
+                libtest/is_pid.hpp \
+                libtest/is_local.hpp \
                 libtest/killpid.h \
                 libtest/libtool.hpp \
                 libtest/memcached.h \
                 libtest/runner.h \
+                libtest/port.h \
                 libtest/server.h \
                 libtest/server_container.h \
                 libtest/signal.h \
+                libtest/socket.hpp \
                 libtest/stats.h \
                 libtest/stream.h \
                 libtest/strerror.h \
@@ -83,14 +88,20 @@ noinst_HEADERS+= \
 
 noinst_LTLIBRARIES+= libtest/libtest.la
 libtest_libtest_la_SOURCES= \
+                           libtest/binaries.cc \
                            libtest/cmdline.cc \
+                           libtest/core.cc \
                            libtest/framework.cc \
+                           libtest/is_local.cc \
                            libtest/killpid.cc \
                            libtest/libtool.cc \
+                           libtest/port.cc \
                            libtest/runner.cc \
                            libtest/server.cc \
                            libtest/server_container.cc \
                            libtest/signal.cc \
+                           libtest/socket.cc \
+                           libtest/strerror.cc \
                            libtest/test.cc
 
 libtest_libtest_la_CXXFLAGS= ${AM_CXXFLAGS}
@@ -138,11 +149,8 @@ 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
 else
@@ -153,12 +161,9 @@ 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_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