X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2FMakefile.am;h=cb4269b3ad9a7202f86004466c03b9dcaca8b5f0;hb=f757325bea76ccff1a88627f5510dc3e32ffd5e7;hp=e0a25e740fe77b97459ea1c18ef1dc5a449c5695;hpb=ccd00450d57624afba24bfbb6e76d1d69d0ad0f8;p=awesomized%2Flibmemcached

diff --git a/tests/Makefile.am b/tests/Makefile.am
index e0a25e74..cb4269b3 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,31 +1,59 @@
-INCLUDES = -I$(top_builddir)/include
+INCLUDES = -I$(top_builddir)/include -I$(top_builddir)/lib
 LDADDS = ../lib/libmemcached.la
 
-EXTRA_DIST = output.res output2.res
+EXTRA_DIST = output.res output2.res\
+		r/memcat.res\
+		r/memcp.res\
+		r/memrm.res\
+		r/memslap.res\
+		r/memstat.res\
+		t/memcat.test\
+		t/memcp.test\
+		t/memrm.test\
+		t/memslap.test\
+		t/memstat.test
 
 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:
 	./testapp > output.res
+	sh t/memcat.test > r/memcat.res
+	sh t/memcp.test > r/memcp.res
+	sh t/memrm.test > r/memrm.res
+	sh t/memslap.test > r/memslap.res
+	sh t/memstat.test > r/memstat.res
 
 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
 
-test-extended: testapp
-	./testapp extended > output.cmp
-	diff output2.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
+	diff r/memcp.res r/memcp.cmp
+	sh t/memrm.test > r/memrm.cmp
+	diff r/memrm.res r/memrm.cmp
+	sh t/memslap.test > r/memslap.cmp
+	diff r/memslap.res r/memslap.cmp
+	sh t/memstat.test > r/memstat.cmp
+	diff r/memstat.res r/memstat.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