X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2FMakefile.am;h=b06d208ac9f3b04bfe73f8683bbf8fc0503b5c53;hb=4dfa3d9f1f719d86062cb01c19a49542f09249ec;hp=f23fde0b9a054c8f44081e1a3d6ba1b80d4f7e85;hpb=07039f809a9e6866b6d32dd28b51937f6eb5a336;p=m6w6%2Flibmemcached diff --git a/tests/Makefile.am b/tests/Makefile.am index f23fde0b..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,10 +15,10 @@ EXTRA_DIST = output.res output2.res\ LIBS = -noinst_HEADERS = test.h server.h +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 server.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 @@ -27,7 +27,7 @@ testplus_LDADD = $(LDADDS) udptest_SOURCES = test.c udp.c server.c udptest_LDADD = $(LDADDS) -atomsmasher_SOURCES = test.c atomsmasher.c server.c ../src/generator.c ../src/execute.c +atomsmasher_SOURCES = test.c atomsmasher.c server.c ../clients/generator.c ../clients/execute.c atomsmasher_LDADD = $(LDADDS) startservers_SOURCES = start.c server.c @@ -71,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"