Update for valgrind failure.

[m6w6/libmemcached] / libtest / include.am

diff --git a/libtest/include.am b/libtest/include.am
index e2921674c0f23af6f4c06d0054c26ef6e11d5464..7cbbb1de57e89c211c3f4d9354f82e227162a741 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
 
@@ -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,8 @@ distclean-libtest-check:
        -rm -rf tmp_chroot
 
 noinst_HEADERS+= \
+                libtest/binaries.h \
+                libtest/cpu.hpp \
                 libtest/blobslap_worker.h \
                 libtest/callbacks.h \
                 libtest/cmdline.h \
@@ -60,18 +65,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 \
@@ -82,6 +91,8 @@ noinst_HEADERS+= \
                 libtest/string.hpp \
                 libtest/test.h \
                 libtest/test.hpp \
+                libtest/tmpfile.hpp \
+                libtest/vchar.hpp \
                 libtest/visibility.h \
                 libtest/wait.h
 
@@ -90,7 +101,12 @@ libtest_libtest_la_SOURCES= \
                            libtest/binaries.cc \
                            libtest/cmdline.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 \
@@ -101,15 +117,19 @@ 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= ${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
@@ -148,13 +168,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
@@ -163,12 +180,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
 
@@ -190,8 +201,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_tmp_dir libtest/abort libtest/wait
 libtest_unittest_LDADD+= libtest/libtest.la
 libtest_unittest_SOURCES= libtest/unittest.cc
 check_PROGRAMS+= libtest/unittest
@@ -200,7 +210,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
@@ -218,3 +228,6 @@ noinst_PROGRAMS+= libtest/skiptest
 
 libtest_wait_SOURCES= libtest/wait.cc
 noinst_PROGRAMS+= libtest/wait
+
+libtest_abort_SOURCES= libtest/abort.cc
+noinst_PROGRAMS+= libtest/abort