X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Finclude.am;h=b09fe364536d43027a5cfeafd54853db708201d1;hb=ad5cb8f903869065c72bb18bf98af6909189a5a9;hp=cb393a221d0453873b88bdecd8d80b53a5ad846d;hpb=5b9ee8fa3c250201bab38812ccb8e44c21fbddf1;p=awesomized%2Flibmemcached

diff --git a/libtest/include.am b/libtest/include.am
index cb393a22..b09fe364 100644
--- a/libtest/include.am
+++ b/libtest/include.am
@@ -5,10 +5,11 @@
 # 
 
 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 --xml-file=./tmp_chroot/var/tmp/yatl-\%p.xml --xml=yes
+VALGRIND_EXEC_COMMAND= $(LIBTOOL_COMMAND) valgrind --error-exitcode=1 --leak-check=yes --track-fds=yes --malloc-fill=A5 --free-fill=DE
 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,22 +32,25 @@ drd:
 	@echo make check TESTS_ENVIRONMENT="\"$(DRD_COMMAND)\""
 
 EXTRA_DIST+= libtest/run.gdb
+EXTRA_DIST+= libtest/version.h
 
-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
 
-.PHONY: distclean-libtest-check
-distclean-libtest-check:
+BUILT_SOURCES+= libtest/version.h
+
+.PHONY: clean-libtest-check
+clean-libtest-check:
 	-rm -rf tmp_chroot
 
+noinst_HEADERS+= libtest/client.hpp
+noinst_HEADERS+= libtest/formatter.hpp
 noinst_HEADERS+= libtest/timer.hpp
+noinst_HEADERS+= libtest/alarm.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 
@@ -67,6 +71,8 @@ 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 
@@ -80,6 +86,7 @@ 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
 
@@ -90,17 +97,21 @@ libtest_libtest_la_DEPENDENCIES=
 libtest_libtest_la_LIBADD=
 libtest_libtest_la_SOURCES=
 
+libtest_libtest_la_SOURCES+= libtest/alarm.cc 
 libtest_libtest_la_SOURCES+= libtest/binaries.cc 
 libtest_libtest_la_SOURCES+= libtest/cmdline.cc 
-libtest_libtest_la_SOURCES+= libtest/comparison.cc 
 libtest_libtest_la_SOURCES+= libtest/collection.cc 
+libtest_libtest_la_SOURCES+= libtest/comparison.cc 
 libtest_libtest_la_SOURCES+= libtest/core.cc 
 libtest_libtest_la_SOURCES+= libtest/cpu.cc 
+libtest_libtest_la_SOURCES+= libtest/dns.cc 
 libtest_libtest_la_SOURCES+= libtest/dream.cc 
+libtest_libtest_la_SOURCES+= libtest/drizzled.cc 
 libtest_libtest_la_SOURCES+= libtest/fatal.cc 
+libtest_libtest_la_SOURCES+= libtest/formatter.cc 
+libtest_libtest_la_SOURCES+= libtest/client.cc 
 libtest_libtest_la_SOURCES+= libtest/framework.cc 
 libtest_libtest_la_SOURCES+= libtest/has.cc 
-libtest_libtest_la_SOURCES+= libtest/drizzled.cc 
 libtest_libtest_la_SOURCES+= libtest/http.cc 
 libtest_libtest_la_SOURCES+= libtest/is_local.cc 
 libtest_libtest_la_SOURCES+= libtest/killpid.cc 
@@ -124,6 +135,7 @@ libtest_libtest_la_CXXFLAGS+= $(CURL_CFLAGS)
 
 libtest_libtest_la_LIBADD+= $(PTHREAD_LIBS)
 libtest_libtest_la_LIBADD+= $(CURL_LIBS)
+libtest_libtest_la_LIBADD+= $(RT_LIB)
 
 libtest_libtest_la_DEPENDENCIES+= libtest_tmp_dir
 libtest_libtest_la_DEPENDENCIES+=libtest/abort
@@ -150,7 +162,7 @@ libtest_unittest_DEPENDENCIES+= libmemcached/libmemcached.la
 libtest_unittest_DEPENDENCIES+= libmemcached/libmemcachedutil.la
 else
 if HAVE_LIBMEMCACHED
-libtest_libtest_la_LIBADD+= $(libmemcached_LIBS)
+libtest_libtest_la_LIBADD+= $(LIBMEMCACHED_UTIL_LDFLAGS)
 libtest_libtest_la_SOURCES+= libtest/memcached.cc
 else
 libtest_libtest_la_CXXFLAGS+= -DHAVE_LIBMEMCACHED=0
@@ -220,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
@@ -241,5 +253,10 @@ libtest_wait_SOURCES+= libtest/wait.cc
 libtest_wait_SOURCES+= libtest/dream.cc
 noinst_PROGRAMS+= libtest/wait
 
+libtest_core_count_SOURCES=
+libtest_core_count_SOURCES+= libtest/cpu.cc
+libtest_core_count_SOURCES+= libtest/core_count.cc
+noinst_PROGRAMS+= libtest/core-count
+
 libtest_abort_SOURCES= libtest/abort.cc
 noinst_PROGRAMS+= libtest/abort