X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Finclude.am;h=4ce5a568cdc664173dea0b6c3ad33a9f51d8b263;hb=61bb2c3a16c0c9723bbb6492283e349a8ccdf11f;hp=f14d9435bb06b0139bf556a82019e9f3da875b73;hpb=3dee67d04099cc5e2986ed94aa612f429f54d6fb;p=awesomized%2Flibmemcached

diff --git a/libtest/include.am b/libtest/include.am
index f14d9435..4ce5a568 100644
--- a/libtest/include.am
+++ b/libtest/include.am
@@ -7,19 +7,73 @@
 #
 # included from Top Level Makefile.am
 # All paths should be given relative to the root
+#
+
+LIBUTEST_TMP = ${abs_top_builddir}/tests/var/tmp/
+
+VALGRIND_COMMAND= $(LIBTOOL) --mode=execute valgrind --leak-check=yes --show-reachable=yes --track-fds=yes --malloc-fill=A5 --free-fill=DE
+
+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_libtest_la_CPPFLAGS= ${AM_CPPFLAGS}
+			   libtest/framework.cc \
+			   libtest/test.cc
+libtest_libtest_la_CFLAGS= ${AM_CFLAGS} ${NO_CONVERSION} -DBUILDING_LIBTEST
+libtest_libtest_la_CXXFLAGS= ${AM_CXXFLAGS} ${NO_CONVERSION} -DBUILDING_LIBTEST
+
+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
+
+libtest_unittest_LDADD= \
+			  libtest/libtest.la
+libtest_unittest_SOURCES= \
+			    libtest/unittest.cc
+noinst_PROGRAMS+= libtest/unittest
+check_PROGRAMS+= libtest/unittest
 
+libtest_wait_SOURCES= libtest/wait.cc
+noinst_PROGRAMS+= libtest/wait