projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Possible fix for solaris compiler.
[m6w6/libmemcached]
/
tests
/
include.am
diff --git
a/tests/include.am
b/tests/include.am
index f1d00ef0f2636204fda7df1701505338734a9fcb..6404153555c77b434ec21bf3b773b288d46c536a 100644
(file)
--- a/
tests/include.am
+++ b/
tests/include.am
@@
-37,6
+37,7
@@
noinst_HEADERS+= \
noinst_PROGRAMS+= \
tests/atomsmasher \
tests/hashplus \
noinst_PROGRAMS+= \
tests/atomsmasher \
tests/hashplus \
+ tests/memplus \
tests/startservers \
tests/testapp \
tests/testhashkit \
tests/startservers \
tests/testapp \
tests/testhashkit \
@@
-51,11
+52,11
@@
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_LDADD= \
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)
+
clients/libgenexec.la \
+
tests/libserver.la \
+
tests/libtest.la \
+
libmemcached/libmemcachedinternal.la \
+$(TESTS_LDADDS)
tests_testapp_DEPENDENCIES= $(tests_testapp_LDADD)
tests_testplus_SOURCES= tests/plus.cpp
tests_testapp_DEPENDENCIES= $(tests_testapp_LDADD)
tests_testplus_SOURCES= tests/plus.cpp
@@
-82,6
+83,10
@@
tests_hashplus_SOURCES = tests/hash_plus.cc
tests_hashplus_LDADD = $(tests_testhashkit_LDADD)
tests_hashplus_DEPENDENCIES = $(tests_testhashkit_LDADD)
tests_hashplus_LDADD = $(tests_testhashkit_LDADD)
tests_hashplus_DEPENDENCIES = $(tests_testhashkit_LDADD)
+tests_memplus_SOURCES = tests/mem_plus.cc
+tests_memplus_LDADD = tests/libtest.la tests/libserver.la libmemcached/libmemcached.la
+tests_memplus_DEPENDENCIES = $(tests_memplus_LDADD)
+
test: test-docs test-mem test-hash memcapable
echo "Tests completed"
test: test-docs test-mem test-hash memcapable
echo "Tests completed"
@@
-204,7
+209,9
@@
MEMSLAP_COMMAND= clients/memslap $(COLLECTION) $(SUITE)
MEM_COMMAND= tests/testapp $(COLLECTION) $(SUITE)
MEM_COMMAND= tests/testapp $(COLLECTION) $(SUITE)
-MEMPLUS_COMMAND= tests/testplus $(COLLECTION) $(SUITE)
+TESTPLUS_COMMAND= tests/testplus $(COLLECTION) $(SUITE)
+
+MEMPLUS_COMMAND= tests/memplus $(COLLECTION) $(SUITE)
HASHPLUS_COMMAND= tests/hashplus $(COLLECTION) $(SUITE)
HASHPLUS_COMMAND= tests/hashplus $(COLLECTION) $(SUITE)
@@
-219,7
+226,7
@@
test-atom: tests/atomsmasher
$(ATOM_COMMAND)
test-plus: tests/testplus
$(ATOM_COMMAND)
test-plus: tests/testplus
- $(
MEM
PLUS_COMMAND)
+ $(
TEST
PLUS_COMMAND)
test-hash: tests/testhashkit
$(HASH_COMMAND)
test-hash: tests/testhashkit
$(HASH_COMMAND)
@@
-227,6
+234,9
@@
test-hash: tests/testhashkit
test-hashplus: tests/hashplus
$(HASHPLUS_COMMAND)
test-hashplus: tests/hashplus
$(HASHPLUS_COMMAND)
+test-memplus: tests/memplus
+ $(MEMPLUS_COMMAND)
+
pahole-mem: tests/testapp
$(PAHOLE_COMMAND) $(MEM_COMMAND)
pahole-mem: tests/testapp
$(PAHOLE_COMMAND) $(MEM_COMMAND)
@@
-237,7
+247,7
@@
gdb-atom: tests/atomsmasher
$(DEBUG_COMMAND) $(ATOM_COMMAND)
gdb-plus: tests/testplus
$(DEBUG_COMMAND) $(ATOM_COMMAND)
gdb-plus: tests/testplus
- $(DEBUG_COMMAND) $(
MEM
PLUS_COMMAND)
+ $(DEBUG_COMMAND) $(
TEST
PLUS_COMMAND)
gdb-hash: tests/testhashkit
$(DEBUG_COMMAND) $(HASH_COMMAND)
gdb-hash: tests/testhashkit
$(DEBUG_COMMAND) $(HASH_COMMAND)
@@
-245,6
+255,9
@@
gdb-hash: tests/testhashkit
gdb-hashplus: tests/hashplus
$(DEBUG_COMMAND) $(HASHPLUS_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)
gdb-memslap: clients/memslap
$(DEBUG_COMMAND) $(MEMSLAP_COMMAND)
@@
-255,7
+268,7
@@
valgrind-atom: tests/atomsmasher
$(VALGRIND_COMMAND) $(ATOM_COMMAND)
valgrind-plus: tests/testplus
$(VALGRIND_COMMAND) $(ATOM_COMMAND)
valgrind-plus: tests/testplus
- $(VALGRIND_COMMAND) $(
MEM
PLUS_COMMAND)
+ $(VALGRIND_COMMAND) $(
TEST
PLUS_COMMAND)
valgrind-hash: tests/testhashkit
$(VALGRIND_COMMAND) $(HASH_COMMAND)
valgrind-hash: tests/testhashkit
$(VALGRIND_COMMAND) $(HASH_COMMAND)
@@
-263,6
+276,9
@@
valgrind-hash: tests/testhashkit
valgrind-hashplus: tests/hashplus
$(VALGRIND_COMMAND) $(HASHPLUS_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)
valgrind-memslap: clients/memslap
$(VALGRIND_COMMAND) $(MEMSLAP_COMMAND)