Merge from trunk.

[m6w6/libmemcached] / tests / Makefile.am

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5f3afcb26452b4050d91bee6d8c9b2e4c402fa5d..c840f68cc9d3124282bbf441af6719c541d624cf 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -27,22 +27,23 @@ libtest_la_SOURCES= test.c
 
 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
+testapp_LDADD = $(top_builddir)/clients/libgenexec.la libtest.la libserver.la $(LDADDS)
 
 testplus_SOURCES = plus.cpp
-testplus_LDADD = $(LDADDS) libtest.la libserver.la
+testplus_LDADD = libtest.la libserver.la $(LDADDS)
 
 udptest_SOURCES = udp.c
-udptest_LDADD = $(LDADDS) libtest.la libserver.la
+udptest_LDADD = libtest.la libserver.la $(LDADDS)
 
 atomsmasher_SOURCES = atomsmasher.c
-atomsmasher_LDADD = $(LDADDS) $(top_builddir)/clients/libgenexec.la libtest.la libserver.la 
+atomsmasher_LDADD = $(top_builddir)/clients/libgenexec.la libtest.la libserver.la $(LDADDS)
 
 startservers_SOURCES = start.c
-startservers_LDADD = $(LDADDS) libserver.la
+startservers_LDADD = libserver.la $(LDADDS)
 
 record:
        ./testapp > output.res
+       ./testplus > output_plus.res
 
 client-record:
        sh t/memcat.test > r/memcat.res
@@ -54,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