X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=libtest%2Finclude.am;h=7cda0f9b9fb91c4e744cf3b4a1bc708df101bee6;hb=a4f7c3b9413014291d0ca549f32455b3be10a6c0;hp=ebc9adf75496c5db07412657a72b7a93d072e71d;hpb=28602fd2f5f1c758b50cd82d4545da8e6c55f5c7;p=awesomized%2Flibmemcached

diff --git a/libtest/include.am b/libtest/include.am
index ebc9adf7..7cda0f9b 100644
--- 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
 
@@ -89,11 +99,12 @@ tests/var/tmp:
 tests/var/run:
 	$(mkdir_p) tests/var/run
 
+.PHONY+= tests/var
+
 
 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