X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Finclude.am;h=ecec6aab29efbd34793955409bdc6c6424f51b27;hb=1d704764a636d3b1618224dbabdcd6e5ae031291;hp=a0d5aa040433df53672dfa09521dfd2c89ee3e8c;hpb=ad36b6040d85dcd7b2bfb64595a551e4b121178c;p=m6w6%2Flibmemcached

diff --git a/libtest/include.am b/libtest/include.am
index a0d5aa04..ecec6aab 100644
--- a/libtest/include.am
+++ b/libtest/include.am
@@ -5,7 +5,7 @@
 # 
 
 LIBTOOL_COMMAND= ${abs_top_builddir}/libtool --mode=execute
-VALGRIND_EXEC_COMMAND= $(LIBTOOL_COMMAND) valgrind --error-exitcode=1 --leak-check=yes --show-reachable=yes --track-fds=yes --malloc-fill=A5 --free-fill=DE
+VALGRIND_EXEC_COMMAND= $(LIBTOOL_COMMAND) valgrind --error-exitcode=1 --leak-check=yes --show-reachable=yes --track-fds=yes --malloc-fill=A5 --free-fill=DE --xml-file=./tmp_chroot/var/tmp/yatl-\%p.xml --xml=yes
 VALGRIND_COMMAND= TESTS_ENVIRONMENT="valgrind" $(VALGRIND_EXEC_COMMAND)
 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
@@ -31,58 +31,61 @@ drd:
 	@echo make check TESTS_ENVIRONMENT="\"$(DRD_COMMAND)\""
 
 EXTRA_DIST+= libtest/run.gdb
+EXTRA_DIST+= libtest/version.h
 
-CLEANFILES+= \
-	     tmp_chroot/var/drizzle/* \
-	     tmp_chroot/var/log/* \
-	     tmp_chroot/var/run/* \
-	     tmp_chroot/var/tmp/*
+CLEANFILES+= tmp_chroot/etc/*
+CLEANFILES+= tmp_chroot/var/drizzle/*
+CLEANFILES+= tmp_chroot/var/log/*
+CLEANFILES+= tmp_chroot/var/run/*
+CLEANFILES+= tmp_chroot/var/tmp/*
+
+BUILT_SOURCES+= libtest/version.h
 
 .PHONY: distclean-libtest-check
 distclean-libtest-check:
 	-rm -rf tmp_chroot
 
 noinst_HEADERS+= libtest/timer.hpp
-noinst_HEADERS+= \
-		 libtest/binaries.h \
-		 libtest/cpu.hpp \
-		 libtest/blobslap_worker.h \
-		 libtest/callbacks.h \
-		 libtest/cmdline.h \
-		 libtest/collection.h \
-		 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/drizzled.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/port.h \
-		 libtest/runner.h \
-		 libtest/server.h \
-		 libtest/server_container.h \
-		 libtest/signal.h \
-		 libtest/socket.hpp \
-		 libtest/stream.h \
-		 libtest/strerror.h \
-		 libtest/string.hpp \
-		 libtest/test.h \
-		 libtest/test.hpp \
-		 libtest/tmpfile.hpp \
-		 libtest/vchar.hpp \
-		 libtest/visibility.h \
-		 libtest/wait.h
+noinst_HEADERS+= libtest/binaries.h 
+noinst_HEADERS+= libtest/cpu.hpp 
+noinst_HEADERS+= libtest/blobslap_worker.h 
+noinst_HEADERS+= libtest/callbacks.h 
+noinst_HEADERS+= libtest/cmdline.h 
+noinst_HEADERS+= libtest/collection.h 
+noinst_HEADERS+= libtest/common.h 
+noinst_HEADERS+= libtest/comparison.hpp 
+noinst_HEADERS+= libtest/core.h 
+noinst_HEADERS+= libtest/dream.h 
+noinst_HEADERS+= libtest/error.h 
+noinst_HEADERS+= libtest/failed.h 
+noinst_HEADERS+= libtest/fatal.hpp 
+noinst_HEADERS+= libtest/framework.h 
+noinst_HEADERS+= libtest/gearmand.h 
+noinst_HEADERS+= libtest/drizzled.h 
+noinst_HEADERS+= libtest/get.h 
+noinst_HEADERS+= libtest/has.hpp 
+noinst_HEADERS+= libtest/http.hpp 
+noinst_HEADERS+= libtest/is_pid.hpp 
+noinst_HEADERS+= libtest/is_local.hpp 
+noinst_HEADERS+= libtest/killpid.h 
+noinst_HEADERS+= libtest/libtool.hpp 
+noinst_HEADERS+= libtest/memcached.h 
+noinst_HEADERS+= libtest/port.h 
+noinst_HEADERS+= libtest/runner.h 
+noinst_HEADERS+= libtest/server.h 
+noinst_HEADERS+= libtest/server_container.h 
+noinst_HEADERS+= libtest/signal.h 
+noinst_HEADERS+= libtest/socket.hpp 
+noinst_HEADERS+= libtest/stream.h 
+noinst_HEADERS+= libtest/strerror.h 
+noinst_HEADERS+= libtest/string.hpp 
+noinst_HEADERS+= libtest/test.h 
+noinst_HEADERS+= libtest/test.hpp 
+noinst_HEADERS+= libtest/tmpfile.hpp 
+noinst_HEADERS+= libtest/vchar.hpp 
+noinst_HEADERS+= libtest/version.h 
+noinst_HEADERS+= libtest/visibility.h 
+noinst_HEADERS+= libtest/wait.h
 
 noinst_LTLIBRARIES+= libtest/libtest.la
 
@@ -190,9 +193,12 @@ endif
 
 libtest_tmp_dir: tmp_chroot/var/log tmp_chroot/var/tmp tmp_chroot/var/run tmp_chroot/var/drizzle
 
-tmp_chroot:
+tmp_chroot: tmp_chroot/etc
 	@$(mkdir_p) tmp_chroot
 
+tmp_chroot/etc:
+	@$(mkdir_p) tmp_chroot/etc
+
 tmp_chroot/var: tmp_chroot
 	@$(mkdir_p) tmp_chroot/var