X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2FMakefile.am;h=5cc1f82e4e2cbc4995a259f5bc46c655e4ad3135;hb=acce29c292b435fef4fd486495dca7d653be2bf2;hp=dd7ba749c9bb3b450ae0fe9d7a4612a5bce15ab5;hpb=276c3db8d1dc8e14949df2b408960a803bea5d53;p=awesomized%2Flibmemcached

diff --git a/tests/Makefile.am b/tests/Makefile.am
index dd7ba749..5cc1f82e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -20,24 +20,30 @@ LIBS =
 
 noinst_HEADERS = test.h server.h ketama_test_cases.h
 noinst_PROGRAMS = testapp testplus udptest atomsmasher startservers
+noinst_LTLIBRARIES= libserver.la libtest.la
 
-testapp_SOURCES = test.c function.c server.c ../clients/generator.c ../clients/execute.c
-testapp_LDADD = $(LDADDS)
+libserver_la_SOURCES= server.c
+libtest_la_SOURCES= test.c
 
-testplus_SOURCES = test.c plus.cpp server.c
-testplus_LDADD = $(LDADDS)
+testapp_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
+testapp_SOURCES = function.c
+testapp_LDADD = $(LDADDS) $(top_builddir)/clients/libgenexec.la libtest.la libserver.la
 
-udptest_SOURCES = test.c udp.c server.c
-udptest_LDADD = $(LDADDS)
+testplus_SOURCES = plus.cpp
+testplus_LDADD = $(LDADDS) libtest.la libserver.la
 
-atomsmasher_SOURCES = test.c atomsmasher.c server.c ../clients/generator.c ../clients/execute.c
-atomsmasher_LDADD = $(LDADDS)
+udptest_SOURCES = udp.c
+udptest_LDADD = $(LDADDS) libtest.la libserver.la
 
-startservers_SOURCES = start.c server.c
-startservers_LDADD = $(LDADDS)
+atomsmasher_SOURCES = atomsmasher.c
+atomsmasher_LDADD = $(LDADDS) $(top_builddir)/clients/libgenexec.la libtest.la libserver.la 
+
+startservers_SOURCES = start.c
+startservers_LDADD = $(LDADDS) libserver.la
 
 record:
 	./testapp > output.res
+	./testplus > output_plus.res
 
 client-record:
 	sh t/memcat.test > r/memcat.res
@@ -49,12 +55,14 @@ client-record:
 record-extended:
 	./testapp extended > output2.res
 
-test: testapp library_test
+test: testapp testplus library_test
 	echo "Tests completed"
 
 library_test:
 	./testapp > output.cmp
 	diff output.res output.cmp
+#	./testplus > output_plus.cmp
+#	diff output_plus.res output_plus.cmp
 
 clients:
 	memcached -d -P /tmp/Xumemc.pid -p 12555
@@ -90,7 +98,7 @@ helgrind:
 	libtool --mode=execute valgrind --tool=helgrind  testapp
 
 helgrind-slap:
-	libtool --mode=execute valgrind --tool=helgrind  ../clients/memslap --server=localhost --concurrency=30
+	libtool --mode=execute valgrind --tool=helgrind  ${top_builddir}/clients/memslap --server=localhost --concurrency=30
 
 test-no-outputdiff: testapp
 	./testapp > /dev/null