X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Finclude.am;h=a88a804b1db44b0eec3c9134242eb6c81f5db2dd;hb=aaf07fb6d380f4e4f0b5404d6b006afcfe62aa7f;hp=593c98fa9e6fa802fdfe3724354fcd0beee14ea5;hpb=2cb0f301484b334b248e65ddb0537bb344125fb4;p=m6w6%2Flibmemcached diff --git a/tests/include.am b/tests/include.am index 593c98fa..a88a804b 100644 --- a/tests/include.am +++ b/tests/include.am @@ -1,8 +1,17 @@ # vim:ft=automake +# Copyright (C) 2011 Data Differential +# All rights reserved. +# +# Use and distribution licensed under the BSD license. See +# the COPYING file in the parent directory for full text. +# # included from Top Level Makefile.am # All paths should be given relative to the root -TESTS_LDADDS = libmemcached/libmemcached.la +TESTS_LDADDS= \ + libmemcached/libmemcached.la \ + libtest/libserver.la \ + libtest/libtest.la VALGRIND_COMMAND= $(LIBTOOL) --mode=execute valgrind --leak-check=yes --show-reachable=yes --track-fds=yes @@ -14,13 +23,17 @@ if BUILD_LIBMEMCACHEDUTIL TESTS_LDADDS+= libmemcached/libmemcachedutil.la endif +EXTRA_DIST+= \ + tests/cpp_example.cc \ + tests/output_plus.res + noinst_HEADERS+= \ tests/hash_results.h \ tests/ketama_test_cases.h \ tests/ketama_test_cases_spy.h \ tests/libmemcached_world.h \ - tests/server.h \ - tests/test.h + tests/parser.h \ + tests/print.h noinst_PROGRAMS+= \ tests/atomsmasher \ @@ -32,51 +45,48 @@ noinst_PROGRAMS+= \ tests/testplus \ tests/testudp -noinst_LTLIBRARIES+= tests/libserver.la -tests_libserver_la_SOURCES= tests/server.c - -noinst_LTLIBRARIES+= tests/libtest.la -tests_libtest_la_SOURCES= tests/test.c - tests_testapp_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING) -tests_testapp_SOURCES= tests/mem_functions.c +tests_testapp_SOURCES= \ + tests/mem_functions.c \ + tests/parser.cc \ + tests/print.cc + tests_testapp_DEPENDENCIES= \ $(BUILT_SOURCES) \ clients/libgenexec.la \ - tests/libserver.la \ - tests/libtest.la \ libmemcached/libmemcachedinternal.la \ $(TESTS_LDADDS) -tests_testapp_LDADD= $(tests_testapp_DEPENDENCIES) $(LIBSASL) + +tests_testapp_LDADD= clients/libgenexec.la \ + libmemcached/libmemcachedinternal.la \ + $(TESTS_LDADDS) $(LIBSASL) tests_testplus_SOURCES= tests/plus.cpp tests_testplus_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX) -tests_testplus_DEPENDENCIES= tests/libtest.la tests/libserver.la $(TESTS_LDADDS) +tests_testplus_DEPENDENCIES= $(TESTS_LDADDS) tests_testplus_LDADD= $(tests_testplus_DEPENDENCIES) $(LIBSASL) tests_atomsmasher_SOURCES= tests/atomsmasher.c tests_atomsmasher_DEPENDENCIES= \ clients/libgenexec.la \ - tests/libserver.la \ - tests/libtest.la \ $(TESTS_LDADDS) + tests_atomsmasher_LDADD= $(tests_atomsmasher_DEPENDENCIES) $(LIBSASL) tests_testudp_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING) tests_testudp_SOURCES= tests/mem_udp.c tests_testudp_DEPENDENCIES= \ clients/libgenexec.la \ - tests/libserver.la \ - tests/libtest.la \ $(TESTS_LDADDS) + tests_testudp_LDADD= $(tests_testudp_DEPENDENCIES) $(LIBSASL) tests_startservers_SOURCES= tests/start.c -tests_startservers_DEPENDENCIES= tests/libserver.la $(TESTS_LDADDS) +tests_startservers_DEPENDENCIES= $(TESTS_LDADDS) tests_startservers_LDADD= $(tests_startservers_DEPENDENCIES) $(LIBSASL) tests_testhashkit_SOURCES = tests/hashkit_functions.c -tests_testhashkit_DEPENDENCIES = tests/libtest.la libhashkit/libhashkit.la +tests_testhashkit_DEPENDENCIES = libtest/libtest.la libhashkit/libhashkit.la tests_testhashkit_LDADD = $(tests_testhashkit_DEPENDENCIES) $(LIBSASL) tests_hashplus_SOURCES = tests/hash_plus.cc @@ -86,26 +96,26 @@ tests_hashplus_LDADD = $(tests_testhashkit_DEPENDENCIES) $(LIBSASL) tests_memplus_SOURCES = tests/mem_plus.cc tests_memplus_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX) -tests_memplus_DEPENDENCIES = tests/libtest.la tests/libserver.la libmemcached/libmemcached.la -tests_memplus_LDADD = $(tests_memplus_DEPENDENCIES) +tests_memplus_DEPENDENCIES = $(TESTS_LDADDS) +tests_memplus_LDADD = $(tests_memplus_DEPENDENCIES) $(LIBSASL) test: check -check-local: test-docs test-mem test-hash memcapable - echo "Tests completed" +check-local: $(TEST_DOCS) test-mem test-hash memcapable + @echo "Tests completed" test-x: check-local test-plus test-memcat test-memcp test-memrm test-memerror test-memdump test-memflush test-memstat - echo "Tests completed" + @echo "Tests completed" memcapable: clients/memcapable - @@MEMC_BINARY@ -d -P `pwd`/tests/Xumemc.pid -p 12555 + @@MEMC_BINARY@ -d -u root -P `pwd`/tests/Xumemc.pid -p 12555 @clients/memcapable -p 12555 || echo "Your memcached server does not support all commands" @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server" @rm tests/Xumemc.pid test-memcat: clients/memcat clients/memcp @echo "Testing memcat" - @@MEMC_BINARY@ -d -P `pwd`/tests/Xumemc.pid -p 12555 + @@MEMC_BINARY@ -d -u root -P `pwd`/tests/Xumemc.pid -p 12555 @clients/memcp --servers="localhost:12555" `pwd`/clients/memcp @clients/memcat --servers="localhost:12555" memcp > `pwd`/tests/scratch @clients/memcat --servers="localhost:12555" --file=`pwd`/tests/scratch2 memcp @@ -117,7 +127,7 @@ test-memcat: clients/memcat clients/memcp valgrind-memcat: clients/memcat clients/memcp @echo "Testing memcat" - @@MEMC_BINARY@ -d -P `pwd`/tests/Xumemc.pid -p 12555 + @@MEMC_BINARY@ -d -u root -P `pwd`/tests/Xumemc.pid -p 12555 @clients/memcp --servers="localhost:12555" clients/memcp @$(VALGRIND_COMMAND) clients/memcat --servers="localhost:12555" memcp > tests/scratch # @diff clients/memcp tests/scratch @@ -127,21 +137,21 @@ valgrind-memcat: clients/memcat clients/memcp test-memcp: clients/memcp @echo "Testing memcp" - @@MEMC_BINARY@ -d -P `pwd`/tests/Xumemc.pid -p 12555 + @@MEMC_BINARY@ -d -u root -P `pwd`/tests/Xumemc.pid -p 12555 @clients/memcp --servers="localhost:12555" clients/memcp clients/memcat clients/memstat @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server" @rm tests/Xumemc.pid valgrind-memcp: clients/memcat clients/memcp @echo "Testing memcp" - @@MEMC_BINARY@ -d -P `pwd`/tests/Xumemc.pid -p 12555 + @@MEMC_BINARY@ -d -u root -P `pwd`/tests/Xumemc.pid -p 12555 @$(VALGRIND_COMMAND) clients/memcp --servers="localhost:12555" clients/memcp clients/memcat clients/memstat @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server" @rm tests/Xumemc.pid test-memrm: clients/memrm clients/memcp @echo "Testing memrm" - @@MEMC_BINARY@ -d -P `pwd`/tests/Xumemc.pid -p 12555 + @@MEMC_BINARY@ -d -u root -P `pwd`/tests/Xumemc.pid -p 12555 @clients/memcp --servers="localhost:12555" clients/memcat @clients/memrm --servers="localhost:12555" memcat @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server" @@ -149,7 +159,7 @@ test-memrm: clients/memrm clients/memcp valgrind-memrm: clients/memcat clients/memcp @echo "Testing memrm" - @@MEMC_BINARY@ -d -P `pwd`/tests/Xumemc.pid -p 12555 + @@MEMC_BINARY@ -d -u root -P `pwd`/tests/Xumemc.pid -p 12555 @clients/memcp --servers="localhost:12555" clients/memcat @$(VALGRIND_COMMAND) clients/memrm --servers="localhost:12555" memcat @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server" @@ -157,21 +167,21 @@ valgrind-memrm: clients/memcat clients/memcp test-memflush: clients/memflush @echo "Testing memflush" - @$(MEMC_BINARY) -d -P `pwd`/tests/Xumemc.pid -p 12555 + @$(MEMC_BINARY) -d -u root -P `pwd`/tests/Xumemc.pid -p 12555 @clients/memflush --servers="localhost:12555" @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server" @rm tests/Xumemc.pid valgrind-memflush: clients/memflush @echo "Testing memflush" - @$(MEMC_BINARY) -d -P `pwd`/tests/Xumemc.pid -p 12555 + @$(MEMC_BINARY) -d -u root -P `pwd`/tests/Xumemc.pid -p 12555 @$(VALGRIND_COMMAND) clients/memflush --servers="localhost:12555" @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server" @rm tests/Xumemc.pid test-memdump: clients/memdump clients/memcp @echo "Testing memdump" - @$(MEMC_BINARY) -d -P `pwd`/tests/Xumemc.pid -p 12555 + @$(MEMC_BINARY) -d -u root -P `pwd`/tests/Xumemc.pid -p 12555 @clients/memcp --servers="localhost:12555" clients/memcat @clients/memdump --servers="localhost:12555" > /dev/null @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server" @@ -179,7 +189,7 @@ test-memdump: clients/memdump clients/memcp valgrind-memdump: clients/memcat clients/memcp @echo "Testing memdump" - @$(MEMC_BINARY) -d -P `pwd`/tests/Xumemc.pid -p 12555 + @$(MEMC_BINARY) -d -u root -P `pwd`/tests/Xumemc.pid -p 12555 @clients/memcp --servers="localhost:12555" clients/memcat @$(VALGRIND_COMMAND) clients/memdump --servers="localhost:12555" > /dev/null @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server" @@ -187,14 +197,14 @@ valgrind-memdump: clients/memcat clients/memcp test-memstat: clients/memstat @echo "Testing memstat" - @$(MEMC_BINARY) -d -P `pwd`/tests/Xumemc.pid -p 12555 + @$(MEMC_BINARY) -d -u root -P `pwd`/tests/Xumemc.pid -p 12555 @clients/memstat --servers="localhost:12555" > /dev/null @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server" @rm tests/Xumemc.pid valgrind-memstat: clients/memstat @echo "Testing memstat" - @$(MEMC_BINARY) -d -P `pwd`/tests/Xumemc.pid -p 12555 + @$(MEMC_BINARY) -d -u root -P `pwd`/tests/Xumemc.pid -p 12555 @$(VALGRIND_COMMAND) clients/memstat --servers="localhost:12555" > /dev/null @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server" @rm tests/Xumemc.pid