Fix it so socket is built just on main tests.

[m6w6/libmemcached] / libtest / include.am

diff --git a/libtest/include.am b/libtest/include.am
index ebc9adf75496c5db07412657a72b7a93d072e71d..4fcfa1b97774dd5dd597aba4cbf9153eb395b2bd 100644 (file)
--- a/libtest/include.am
+++ b/libtest/include.am
@@ -12,9 +12,11 @@
 LIBUTEST_TMP = ${abs_top_builddir}/tests/var/tmp/
 
 VALGRIND_COMMAND= $(LIBTOOL) --mode=execute valgrind --error-exitcode=1 --leak-check=yes --show-reachable=yes --track-fds=yes --malloc-fill=A5 --free-fill=DE
-HELGRIND_COMMAND= $(LIBTOOL) --mode=execute valgrind --tool=helgrind --read-var-info=yes --error-exitcode=1 
+HELGRIND_COMMAND= $(LIBTOOL) --mode=execute valgrind --tool=helgrind --read-var-info=yes --error-exitcode=1  -v
 DRD_COMMAND= $(LIBTOOL) --mode=execute valgrind --tool=drd
-GDB_COMMAND= $(LIBTOOL) --mode=execute gdb
+GDB_COMMAND= $(LIBTOOL) --mode=execute gdb -f -x libtest/run.gdb
+
+EXTRA_DIST+= libtest/run.gdb
 
 CLEANFILES+= \
             tests/var/log/* \
@@ -25,6 +27,7 @@ noinst_HEADERS+= \
                 libtest/callbacks.h \
                 libtest/cmdline.h \
                 libtest/collection.h \
+                libtest/comparison.hpp \
                 libtest/common.h \
                 libtest/core.h \
                 libtest/error.h \
@@ -38,7 +41,9 @@ noinst_HEADERS+= \
                 libtest/server.h \
                 libtest/signal.h \
                 libtest/stats.h \
+                libtest/stream.h \
                 libtest/strerror.h \
+                libtest/string.hpp \
                 libtest/test.h \
                 libtest/test.hpp \
                 libtest/visibility.h \
@@ -61,7 +66,12 @@ libtest_libtest_la_LIBADD=
 LIBTEST_LDADD= libtest/libtest.la
 
 if HAVE_LIBMEMCACHED
-LIBTEST_LDADD+= $(libmemcached_LIBS) -lmemcachedutil
+if BUILD_LIBMEMCACHEDUTIL
+LIBTEST_LDADD+= libmemcached/libmemcached.la
+LIBTEST_LDADD+= libmemcached/libmemcachedutil.la
+else
+LIBTEST_LDADD+= $(libmemcached_LIBS)
+endif
 libtest_libtest_la_SOURCES+= libtest/memcached.cc
 endif
 
@@ -91,9 +101,8 @@ tests/var/run:
 
 
 libtest_unittest_CFLAGS=
-libtest_unittest_LDADD= \
-                       ${LIBTEST_LDADD} \
-                       libtest/libtest.la
+libtest_unittest_LDADD= ${LIBTEST_LDADD}
+libtest_unittest_DEPENDENCIES= ${LIBTEST_LDADD}
 libtest_unittest_SOURCES= libtest/unittest.cc
 check_PROGRAMS+= libtest/unittest
 noinst_PROGRAMS+= libtest/unittest