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

diff --git a/tests/Makefile.am b/tests/Makefile.am
index cb4269b3..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,14 +15,28 @@ EXTRA_DIST = output.res output2.res\
 
 LIBS = 
 
-noinst_HEADERS = test.h
-noinst_PROGRAMS = testapp
+noinst_HEADERS = test.h server.h ketama_test_cases.h
+noinst_PROGRAMS = testapp testplus udptest atomsmasher startservers
 
-testapp_SOURCES = test.c function.c ../src/generator.c ../src/execute.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
@@ -57,3 +71,7 @@ clients:
 
 valgrind:
 	libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes  testapp
+
+test-no-outputdiff: testapp
+	./testapp > /dev/null
+	@echo "Test completed"