projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in dist fix from Monty
[m6w6/libmemcached]
/
tests
/
include.am
diff --git
a/tests/include.am
b/tests/include.am
index b71f0c79ed83f9cba3064dc32136d3f9e6ae0798..b90a5ef7d9f8559f33b833ecdf3bbe0697c7be02 100644
(file)
--- a/
tests/include.am
+++ b/
tests/include.am
@@
-4,7
+4,7
@@
TESTS_LDADDS = libmemcached/libmemcached.la
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
DEBUG_COMMAND= $(LIBTOOL) --mode=execute gdb
@@
-15,16
+15,8
@@
TESTS_LDADDS+= libmemcached/libmemcachedutil.la
endif
EXTRA_DIST+= \
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
+ tests/cpp_example.cc \
+ tests/output_plus.res
noinst_HEADERS+= \
tests/hash_results.h \
noinst_HEADERS+= \
tests/hash_results.h \
@@
-53,32
+45,38
@@
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_DEPENDENCIES= \
tests_testapp_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
tests_testapp_SOURCES= tests/mem_functions.c
tests_testapp_DEPENDENCIES= \
- clients/libgenexec.la \
+ $(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/libserver.la \
tests/libtest.la \
libmemcached/libmemcachedinternal.la \
- $(TESTS_LDADDS)
-tests_testapp_LDADD= $(tests_testapp_DEPENDENCIES) $(LIBSASL)
+ $(TESTS_LDADDS) $(LIBSASL)
tests_testplus_SOURCES= tests/plus.cpp
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_LDADD= $(tests_testplus_DEPENDENCIES) $(LIBSASL)
tests_atomsmasher_SOURCES= tests/atomsmasher.c
tests_atomsmasher_DEPENDENCIES= \
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_DEPENDENCIES= \
- clients/libgenexec.la \
- tests/libserver.la \
- tests/libtest.la \
- $(TESTS_LDADDS)
+
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= \
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)
+
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_testudp_LDADD= $(tests_testudp_DEPENDENCIES) $(LIBSASL)
tests_startservers_SOURCES= tests/start.c
@@
-90,28
+88,32
@@
tests_testhashkit_DEPENDENCIES = tests/libtest.la libhashkit/libhashkit.la
tests_testhashkit_LDADD = $(tests_testhashkit_DEPENDENCIES) $(LIBSASL)
tests_hashplus_SOURCES = tests/hash_plus.cc
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_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_DEPENDENCIES = tests/libtest.la tests/libserver.la libmemcached/libmemcached.la
-tests_memplus_LDADD = $(tests_memplus_DEPENDENCIES)
+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
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"
@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
@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
@@
-123,7
+125,7
@@
test-memcat: clients/memcat clients/memcp
valgrind-memcat: clients/memcat clients/memcp
@echo "Testing memcat"
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
@clients/memcp --servers="localhost:12555" clients/memcp
@$(VALGRIND_COMMAND) clients/memcat --servers="localhost:12555" memcp > tests/scratch
# @diff clients/memcp tests/scratch
@@
-133,21
+135,21
@@
valgrind-memcat: clients/memcat clients/memcp
test-memcp: clients/memcp
@echo "Testing 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"
@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"
@$(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"
@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"
@@
-155,7
+157,7
@@
test-memrm: clients/memrm clients/memcp
valgrind-memrm: clients/memcat clients/memcp
@echo "Testing memrm"
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"
@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"
@@
-163,21
+165,21
@@
valgrind-memrm: clients/memcat clients/memcp
test-memflush: clients/memflush
@echo "Testing memflush"
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"
@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"
@$(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"
@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"
@@
-185,7
+187,7
@@
test-memdump: clients/memdump clients/memcp
valgrind-memdump: clients/memcat clients/memcp
@echo "Testing memdump"
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"
@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"
@@
-193,14
+195,14
@@
valgrind-memdump: clients/memcat clients/memcp
test-memstat: clients/memstat
@echo "Testing memstat"
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"
@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
@$(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