X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2FMakefile.am;h=b06d208ac9f3b04bfe73f8683bbf8fc0503b5c53;hb=fab8af030c2dcb51fb46da14faa2c9623462e510;hp=140338d1197e8bfeba23f1311e30131c0ca49077;hpb=82b9ad4652c38c7fc0a31505fd38f95246e379f9;p=awesomized%2Flibmemcached

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 140338d1..b06d208a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,5 @@
-INCLUDES = -I$(top_builddir)/include -I$(top_builddir)/lib
-LDADDS = ../lib/libmemcached.la
+INCLUDES = -I$(top_builddir)
+LDADDS = $(top_builddir)/libmemcached/libmemcached.la
 
 EXTRA_DIST = output.res output2.res\
 		r/memcat.res\
@@ -15,13 +15,28 @@ EXTRA_DIST = output.res output2.res\
 
 LIBS = 
 
-noinst_PROGRAMS = testapp
+noinst_HEADERS = test.h server.h ketama_test_cases.h
+noinst_PROGRAMS = testapp testplus udptest atomsmasher startservers
 
-testapp_SOURCES = test.c
+testapp_SOURCES = test.c function.c server.c ../clients/generator.c ../clients/execute.c
 testapp_LDADD = $(LDADDS)
 
+testplus_SOURCES = test.c plus.cpp server.c
+testplus_LDADD = $(LDADDS)
+
+udptest_SOURCES = test.c udp.c server.c
+udptest_LDADD = $(LDADDS)
+
+atomsmasher_SOURCES = test.c atomsmasher.c server.c ../clients/generator.c ../clients/execute.c
+atomsmasher_LDADD = $(LDADDS)
+
+startservers_SOURCES = start.c server.c
+startservers_LDADD = $(LDADDS)
+
 record:
 	./testapp > output.res
+
+client-record:
 	sh t/memcat.test > r/memcat.res
 	sh t/memcp.test > r/memcp.res
 	sh t/memrm.test > r/memrm.res
@@ -31,9 +46,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,10 +66,12 @@ 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
+
+test-no-outputdiff: testapp
+	./testapp > /dev/null
+	@echo "Test completed"