Refactor of async code. poll() is now only called when needed.

[awesomized/libmemcached] / tests / Makefile.am

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 25b1962e3ab5a18206a89190d0cbaf83e9dbfb06..cb4269b3ad9a7202f86004466c03b9dcaca8b5f0 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_builddir)/include
+INCLUDES = -I$(top_builddir)/include -I$(top_builddir)/lib
 LDADDS = ../lib/libmemcached.la
 
 EXTRA_DIST = output.res output2.res\
@@ -15,9 +15,10 @@ EXTRA_DIST = output.res output2.res\
 
 LIBS = 
 
+noinst_HEADERS = test.h
 noinst_PROGRAMS = testapp
 
-testapp_SOURCES = test.c
+testapp_SOURCES = test.c function.c ../src/generator.c ../src/execute.c
 testapp_LDADD = $(LDADDS)
 
 record:
@@ -31,9 +32,16 @@ record:
 record-extended:
        ./testapp extended > output2.res
 
-test: testapp
+test: testapp library_test
+       echo "Tests completed"
+
+library_test:
        ./testapp > output.cmp
        diff output.res output.cmp
+
+clients:
+       memcached -d -P /tmp/Xumemc.pid -p 12555
+       export MEMCACHED_SERVERS="localhost:12555"
        sh t/memcat.test > r/memcat.cmp
        diff r/memcat.res r/memcat.cmp
        sh t/memcp.test > r/memcp.cmp
@@ -44,13 +52,8 @@ test: testapp
        diff r/memslap.res r/memslap.cmp
        sh t/memstat.test > r/memstat.cmp
        diff r/memstat.res r/memstat.cmp
-
-test-extended: testapp
-       ./testapp extended > output.cmp
-       diff output2.res output.cmp
+       cat /tmp/Xumemc.pid | xargs kill
+       rm /tmp/Xumemc.pid
 
 valgrind:
        libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes  testapp
-
-valgrind-extended:
-       libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes  testapp extended