X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Finclude.am;h=3dd6982a5843a005a32aa29e19a936d51ce14fa6;hb=79382f4948d4734711dda45e1ac397bf7149076c;hp=a0d5aa040433df53672dfa09521dfd2c89ee3e8c;hpb=437bc4483f63b8e2c746bc69082c846ca43f9561;p=awesomized%2Flibmemcached

diff --git a/libtest/include.am b/libtest/include.am
index a0d5aa04..3dd6982a 100644
--- a/libtest/include.am
+++ b/libtest/include.am
@@ -9,6 +9,7 @@ VALGRIND_EXEC_COMMAND= $(LIBTOOL_COMMAND) valgrind --error-exitcode=1 --leak-che
 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
+MASSIF_COMMAND= $(LIBTOOL_COMMAND) valgrind --tool=massif
 GDB_COMMAND= $(LIBTOOL_COMMAND) gdb -f -x libtest/run.gdb
 PTRCHECK_COMMAND= $(LIBTOOL_COMMAND) valgrind --tool=exp-ptrcheck --error-exitcode=1
 
@@ -31,58 +32,66 @@ 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/*
+CLEANFILES+= tmp_chroot/*.xml
+
+BUILT_SOURCES+= libtest/version.h
 
 .PHONY: distclean-libtest-check
 distclean-libtest-check:
 	-rm -rf tmp_chroot
 
+noinst_HEADERS+= libtest/formatter.hpp
 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/dns.hpp 
+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/memcached.hpp
+noinst_HEADERS+= libtest/poll_error.hpp
+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
 
@@ -92,6 +101,7 @@ libtest_libtest_la_LIBADD=
 libtest_libtest_la_SOURCES=
 
 libtest_libtest_la_SOURCES+= libtest/binaries.cc 
+libtest_libtest_la_SOURCES+= libtest/dns.cc 
 libtest_libtest_la_SOURCES+= libtest/cmdline.cc 
 libtest_libtest_la_SOURCES+= libtest/comparison.cc 
 libtest_libtest_la_SOURCES+= libtest/collection.cc 
@@ -99,6 +109,7 @@ libtest_libtest_la_SOURCES+= libtest/core.cc
 libtest_libtest_la_SOURCES+= libtest/cpu.cc 
 libtest_libtest_la_SOURCES+= libtest/dream.cc 
 libtest_libtest_la_SOURCES+= libtest/fatal.cc 
+libtest_libtest_la_SOURCES+= libtest/formatter.cc 
 libtest_libtest_la_SOURCES+= libtest/framework.cc 
 libtest_libtest_la_SOURCES+= libtest/has.cc 
 libtest_libtest_la_SOURCES+= libtest/drizzled.cc 
@@ -190,9 +201,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
 
@@ -218,7 +232,7 @@ test-unittest: libtest/unittest
 	@libtest/unittest
 
 valgrind-unittest: libtest/unittest
-	@$(VALGRIND_COMMAND) libtest/unittest TESTS_ENVIRONMENT="valgrind"
+	@$(VALGRIND_COMMAND) libtest/unittest
 
 gdb-unittest: libtest/unittest
 	@$(GDB_COMMAND) libtest/unittest