TESTS_LDADDS = libmemcached/libmemcached.la
-VALGRIND_COMMAND= $(LIBTOOL) --mode=execute valgrind --leak-check=yes --show-reachable=yes
+VALGRIND_COMMAND= $(LIBTOOL) --mode=execute valgrind --leak-check=yes --show-reachable=yes --track-fds=yes
DEBUG_COMMAND= $(LIBTOOL) --mode=execute gdb
TESTS_LDADDS+= libmemcached/libmemcachedutil.la
endif
-EXTRA_DIST+= \
- tests/r/memcat.res \
- tests/r/memcp.res \
- tests/r/memrm.res \
- tests/r/memslap.res \
- tests/r/memstat.res \
- tests/t/memcat.test \
- tests/t/memcp.test \
- tests/t/memrm.test \
- tests/t/memslap.test \
- tests/t/memstat.test
-
noinst_HEADERS+= \
tests/hash_results.h \
tests/ketama_test_cases.h \
noinst_PROGRAMS+= \
tests/atomsmasher \
+ tests/hashplus \
+ tests/memplus \
tests/startservers \
tests/testapp \
tests/testhashkit \
- tests/testplus
+ tests/testplus \
+ tests/testudp
noinst_LTLIBRARIES+= tests/libserver.la
tests_libserver_la_SOURCES= tests/server.c
tests_testapp_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
tests_testapp_SOURCES= tests/mem_functions.c
-tests_testapp_LDADD= \
- clients/libgenexec.la \
- tests/libserver.la \
- tests/libtest.la \
- libmemcached/libmemcachedinternal.la \
- $(TESTS_LDADDS)
-tests_testapp_DEPENDENCIES= $(tests_testapp_LDADD)
+tests_testapp_DEPENDENCIES= \
+ $(BUILT_SOURCES) \
+ clients/libgenexec.la \
+ tests/libserver.la \
+ tests/libtest.la \
+ libmemcached/libmemcachedinternal.la \
+ $(TESTS_LDADDS)
+tests_testapp_LDADD= clients/libgenexec.la \
+ tests/libserver.la \
+ tests/libtest.la \
+ libmemcached/libmemcachedinternal.la \
+ $(TESTS_LDADDS) $(LIBSASL)
tests_testplus_SOURCES= tests/plus.cpp
-tests_testplus_LDADD= tests/libtest.la tests/libserver.la $(TESTS_LDADDS)
-tests_testplus_DEPENDENCIES= $(tests_testplus_LDADD)
+tests_testplus_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX)
+tests_testplus_DEPENDENCIES= tests/libtest.la tests/libserver.la $(TESTS_LDADDS)
+tests_testplus_LDADD= $(tests_testplus_DEPENDENCIES) $(LIBSASL)
tests_atomsmasher_SOURCES= tests/atomsmasher.c
-tests_atomsmasher_LDADD= \
- clients/libgenexec.la \
- tests/libserver.la \
- tests/libtest.la \
- $(TESTS_LDADDS)
-tests_atomsmasher_DEPENDENCIES= $(tests_atomsmasher_LDADD)
+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_LDADD= tests/libserver.la $(TESTS_LDADDS)
-tests_startservers_DEPENDENCIES= $(tests_startservers_LDADD)
+tests_startservers_DEPENDENCIES= tests/libserver.la $(TESTS_LDADDS)
+tests_startservers_LDADD= $(tests_startservers_DEPENDENCIES) $(LIBSASL)
tests_testhashkit_SOURCES = tests/hashkit_functions.c
-tests_testhashkit_LDADD = tests/libtest.la libhashkit/libhashkit.la
-tests_testhashkit_DEPENDENCIES = $(tests_testhashkit_LDADD)
+tests_testhashkit_DEPENDENCIES = tests/libtest.la libhashkit/libhashkit.la
+tests_testhashkit_LDADD = $(tests_testhashkit_DEPENDENCIES) $(LIBSASL)
+
+tests_hashplus_SOURCES = tests/hash_plus.cc
+tests_hashplus_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX)
+tests_hashplus_DEPENDENCIES = $(tests_testhashkit_DEPENDENCIES)
+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) $(LIBSASL)
-test: test-docs test-mem test-hash memcapable
- echo "Tests completed"
+test: check
-test-x: test-docs test-plus test-mem test-hash memcapable test-memcat test-memcp test-memrm test-memerror test-memdump test-memflush test-memstat
- 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"
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
- @clients/memcp --servers="localhost:12555" clients/memcp
- @clients/memcat --servers="localhost:12555" memcp > tests/scratch
+ @@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
# @diff clients/memcp tests/scratch
- @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
- @rm tests/Xumemc.pid
- @rm tests/scratch
+ @cat `pwd`/tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
+ @rm `pwd`/tests/Xumemc.pid
+ @rm `pwd`/tests/scratch
+ @rm `pwd`/tests/scratch2
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
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"
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"
test-memflush: clients/memflush
@echo "Testing memflush"
- @/usr/local/bin/memcached -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"
- @/usr/local/bin/memcached -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"
- @/usr/local/bin/memcached -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"
valgrind-memdump: clients/memcat clients/memcp
@echo "Testing memdump"
- @/usr/local/bin/memcached -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"
test-memstat: clients/memstat
@echo "Testing memstat"
- @/usr/local/bin/memcached -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"
- @/usr/local/bin/memcached -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
MEM_COMMAND= tests/testapp $(COLLECTION) $(SUITE)
-PLUS_COMMAND= tests/testplus $(COLLECTION) $(SUITE)
+TESTPLUS_COMMAND= tests/testplus $(COLLECTION) $(SUITE)
+
+MEMPLUS_COMMAND= tests/memplus $(COLLECTION) $(SUITE)
+
+HASHPLUS_COMMAND= tests/hashplus $(COLLECTION) $(SUITE)
ATOM_COMMAND= tests/atomsmasher $(COLLECTION) $(SUITE)
+UDP_COMMAND= tests/testudp $(COLLECTION) $(SUITE)
+
HASH_COMMAND= tests/testhashkit $(COLLECTION) $(SUITE)
test-mem: tests/testapp
$(MEM_COMMAND)
+test-udp: tests/testudp
+ $(UDP_COMMAND)
+
test-atom: tests/atomsmasher
$(ATOM_COMMAND)
test-plus: tests/testplus
- $(PLUS_COMMAND)
+ $(TESTPLUS_COMMAND)
test-hash: tests/testhashkit
$(HASH_COMMAND)
+test-hashplus: tests/hashplus
+ $(HASHPLUS_COMMAND)
+
+test-memplus: tests/memplus
+ $(MEMPLUS_COMMAND)
+
pahole-mem: tests/testapp
$(PAHOLE_COMMAND) $(MEM_COMMAND)
-
gdb-mem: tests/testapp
$(DEBUG_COMMAND) $(MEM_COMMAND)
gdb-atom: tests/atomsmasher
+ $(DEBUG_COMMAND) $(UDP_COMMAND)
+
+gdb-udp: tests/testudp
$(DEBUG_COMMAND) $(ATOM_COMMAND)
gdb-plus: tests/testplus
- $(DEBUG_COMMAND) $(PLUS_COMMAND)
+ $(DEBUG_COMMAND) $(TESTPLUS_COMMAND)
gdb-hash: tests/testhashkit
$(DEBUG_COMMAND) $(HASH_COMMAND)
+gdb-hashplus: tests/hashplus
+ $(DEBUG_COMMAND) $(HASHPLUS_COMMAND)
+
+gdb-memplus: tests/memplus
+ $(DEBUG_COMMAND) $(MEMPLUS_COMMAND)
+
gdb-memslap: clients/memslap
$(DEBUG_COMMAND) $(MEMSLAP_COMMAND)
valgrind-atom: tests/atomsmasher
$(VALGRIND_COMMAND) $(ATOM_COMMAND)
+valgrind-udp: tests/testudp
+ $(VALGRIND_COMMAND) $(UDP_COMMAND)
+
valgrind-plus: tests/testplus
- $(VALGRIND_COMMAND) $(PLUS_COMMAND)
+ $(VALGRIND_COMMAND) $(TESTPLUS_COMMAND)
valgrind-hash: tests/testhashkit
$(VALGRIND_COMMAND) $(HASH_COMMAND)
+valgrind-hashplus: tests/hashplus
+ $(VALGRIND_COMMAND) $(HASHPLUS_COMMAND)
+
+valgrind-memplus: tests/memplus
+ $(VALGRIND_COMMAND) $(MEMPLUS_COMMAND)
+
valgrind-memslap: clients/memslap
$(VALGRIND_COMMAND) $(MEMSLAP_COMMAND)