projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Updating test framework for startup/shutdown of memcached.
[m6w6/libmemcached]
/
libtest
/
include.am
diff --git
a/libtest/include.am
b/libtest/include.am
index a1ed6ede1d298c574d8d094708540ed3dd822825..0f4d910dd97906238c2a64c2e5000e685faab27f 100644
(file)
--- a/
libtest/include.am
+++ b/
libtest/include.am
@@
-13,6
+13,7
@@
LIBUTEST_TMP = ${abs_top_builddir}/tests/var/tmp/
CLEANFILES+= \
tests/var/log/* \
CLEANFILES+= \
tests/var/log/* \
+ tests/var/run/* \
tests/var/tmp/*
noinst_HEADERS+= \
tests/var/tmp/*
noinst_HEADERS+= \
@@
-24,16
+25,21
@@
noinst_HEADERS+= \
libtest/failed.h \
libtest/framework.h \
libtest/get.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/test.hpp \
libtest/runner.h \
libtest/server.h \
libtest/stats.h \
libtest/strerror.h \
libtest/test.h \
libtest/test.hpp \
- libtest/visibility.h
+ libtest/visibility.h \
+ libtest/wait.h
noinst_LTLIBRARIES+= libtest/libserver.la
noinst_LTLIBRARIES+= libtest/libserver.la
-libtest_libserver_la_SOURCES= libtest/memcached.cc
+libtest_libserver_la_SOURCES= \
+ libtest/killpid.cc \
+ libtest/memcached.cc \
+ libtest/server.cc
noinst_LTLIBRARIES+= libtest/libtest.la
libtest_libtest_la_SOURCES=\
noinst_LTLIBRARIES+= libtest/libtest.la
libtest_libtest_la_SOURCES=\
@@
-42,7
+48,13
@@
libtest_libtest_la_SOURCES=\
libtest_libtest_la_CFLAGS= ${AM_CFLAGS} ${NO_CONVERSION} -DBUILDING_LIBTEST
libtest_libtest_la_CPPFLAGS= ${AM_CPPFLAGS}
libtest_libtest_la_CFLAGS= ${AM_CFLAGS} ${NO_CONVERSION} -DBUILDING_LIBTEST
libtest_libtest_la_CPPFLAGS= ${AM_CPPFLAGS}
-tests/var: tests/var/log tests/var/tmp
+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
tests/var/log:
@@
-50,3
+62,10
@@
tests/var/log:
tests/var/tmp:
$(mkdir_p) tests/var/tmp
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