X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Finclude.am;h=0f4d910dd97906238c2a64c2e5000e685faab27f;hb=7abcaebdc4c3dd11b779eaef58a7371fb82ae888;hp=f14d9435bb06b0139bf556a82019e9f3da875b73;hpb=faae971a1b825275ed3585c9692be3d84a62ce01;p=m6w6%2Flibmemcached

diff --git a/libtest/include.am b/libtest/include.am
index f14d9435..0f4d910d 100644
--- a/libtest/include.am
+++ b/libtest/include.am
@@ -7,19 +7,65 @@
 #
 # included from Top Level Makefile.am
 # All paths should be given relative to the root
+#
+
+LIBUTEST_TMP = ${abs_top_builddir}/tests/var/tmp/
+
+CLEANFILES+= \
+	     tests/var/log/* \
+	     tests/var/run/* \
+	     tests/var/tmp/*
 
 noinst_HEADERS+= \
+		 libtest/callbacks.h \
+		 libtest/collection.h \
+		 libtest/common.h \
+		 libtest/core.h \
+		 libtest/error.h \
 		 libtest/failed.h \
+		 libtest/framework.h \
+		 libtest/get.h \
+		 libtest/killpid.h \
+		 libtest/runner.h \
 		 libtest/server.h \
+		 libtest/stats.h \
+		 libtest/strerror.h \
 		 libtest/test.h \
-		 libtest/visibility.h
+		 libtest/test.hpp \
+		 libtest/visibility.h \
+		 libtest/wait.h
 
 noinst_LTLIBRARIES+= libtest/libserver.la
-libtest_libserver_la_SOURCES= libtest/server.c
+libtest_libserver_la_SOURCES= \
+			      libtest/killpid.cc \
+			      libtest/memcached.cc \
+			      libtest/server.cc
 
 noinst_LTLIBRARIES+= libtest/libtest.la
 libtest_libtest_la_SOURCES=\
-			   libtest/test.c
-libtest_libtest_la_CFLAGS= ${AM_CFLAGS} ${NO_CONVERSION}
+			   libtest/framework.cc \
+			   libtest/test.cc
+libtest_libtest_la_CFLAGS= ${AM_CFLAGS} ${NO_CONVERSION} -DBUILDING_LIBTEST
 libtest_libtest_la_CPPFLAGS= ${AM_CPPFLAGS}
 
+clearn-var:
+	@rm -f tests/var/log/*
+	@rm -f tests/var/run/*
+	@rm -f tests/var/tmp/*
+
+
+tests/var: tests/var/log tests/var/tmp tests/var/run clearn-var
+	$(mkdir_p) tests/var
+
+tests/var/log:
+	$(mkdir_p) tests/var/log
+
+tests/var/tmp:
+	$(mkdir_p) tests/var/tmp
+
+tests/var/run:
+	$(mkdir_p) tests/var/run
+
+noinst_PROGRAMS+= libtest/wait
+
+libtest_wait_SOURCES= libtest/wait.cc