projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge working tree with build tree.
[m6w6/libmemcached]
/
tests
/
include.am
diff --git
a/tests/include.am
b/tests/include.am
index bfdb36b882a94f7f47d39f309a6575547b18fa11..c0d7771c1e125c5d7cccdb8783f23e7a799b38be 100644
(file)
--- a/
tests/include.am
+++ b/
tests/include.am
@@
-8,23
+8,23
@@
# included from Top Level Makefile.am
# All paths should be given relative to the root
# included from Top Level Makefile.am
# All paths should be given relative to the root
-TESTS_LDADDS=
\
- libmemcached/libmemcached.la \
- libmemcached/libmemcachedutil.la \
-
libtest/libtest.la
+TESTS_LDADDS=
+TESTS_LDADDS+= libmemcached/libmemcached.la
+TESTS_LDADDS+= libmemcached/libmemcachedutil.la
+
TESTS_LDADDS+=
libtest/libtest.la
DEBUG_COMMAND= $(LIBTOOL) --mode=execute gdb
PAHOLE_COMMAND= $(LIBTOOL) --mode=execute pahole
DEBUG_COMMAND= $(LIBTOOL) --mode=execute gdb
PAHOLE_COMMAND= $(LIBTOOL) --mode=execute pahole
-EXTRA_DIST+= \
- tests/cpp_example.cc \
- tests/output_plus.res
+EXTRA_DIST+= tests/cpp_example.cc
+EXTRA_DIST+= tests/output_plus.res
-noinst_HEADERS+= \
- tests/exist.h \
- tests/hash_results.h \
- tests/libmemcached_world.h
+noinst_HEADERS+= tests/exist.h
+noinst_HEADERS+= tests/keys.hpp
+noinst_HEADERS+= tests/hash_results.h
+noinst_HEADERS+= tests/libmemcached_world.h
+noinst_HEADERS+= tests/libmemcached_world_socket.h
# Cycle should always run first
tests_cycle_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
# Cycle should always run first
tests_cycle_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
@@
-66,37
+66,34
@@
test: check
check-local: $(TEST_DOCS)
@echo "Tests completed"
check-local: $(TEST_DOCS)
@echo "Tests completed"
-test-x: test-plus test-memcp test-memdump test-memflush test-memstat
- @echo "Tests completed"
-
-test-mem: tests/var tests/libmemcached-1.0/testapp
+test-mem: tests/libmemcached-1.0/testapp
@tests/libmemcached-1.0/testapp
test-sasl: tests/sasl
@tests/sasl
@tests/libmemcached-1.0/testapp
test-sasl: tests/sasl
@tests/sasl
-test-atom: tests/
var tests/
atomsmasher
+test-atom: tests/atomsmasher
@tests/atomsmasher
@tests/atomsmasher
-test-plus: tests/
var tests/
testplus
+test-plus: tests/testplus
@tests/testplus
@tests/testplus
-test-hash: tests/
var tests/
testhashkit
+test-hash: tests/testhashkit
@tests/testhashkit
@tests/testhashkit
-test-hashplus: tests/
var tests/
hash_plus
+test-hashplus: tests/hash_plus
@tests/hash_plus
@tests/hash_plus
-test-cycle: tests/
var tests/
cycle
+test-cycle: tests/cycle
@tests/cycle
@tests/cycle
-test-memcapable: tests/
var tests/
memcapable
+test-memcapable: tests/memcapable
@tests/memcapable
pahole-mem: tests/testapp
@$(PAHOLE_COMMAND) tests/testapp
@tests/memcapable
pahole-mem: tests/testapp
@$(PAHOLE_COMMAND) tests/testapp
-gdb-mem: tests/
var tests/
libmemcached-1.0/testapp
+gdb-mem: tests/libmemcached-1.0/testapp
@$(DEBUG_COMMAND) tests/libmemcached-1.0/testapp
gdb-sasl: tests/sasl
@$(DEBUG_COMMAND) tests/libmemcached-1.0/testapp
gdb-sasl: tests/sasl
@@
-123,8
+120,8
@@
gdb-failure: tests/failure
valgrind-cycle: tests/cycle
$(VALGRIND_COMMAND) tests/cycle
valgrind-cycle: tests/cycle
$(VALGRIND_COMMAND) tests/cycle
-valgrind-mem: tests/testapp
- @$(VALGRIND_COMMAND) tests/testapp
+valgrind-mem: tests/
libmemcached-1.0/
testapp
+ @$(VALGRIND_COMMAND) tests/
libmemcached-1.0/
testapp
valgrind-failure: tests/failure
@$(VALGRIND_COMMAND) tests/failure
valgrind-failure: tests/failure
@$(VALGRIND_COMMAND) tests/failure
@@
-147,8
+144,8
@@
valgrind-hashplus: tests/hash_plus
helgrind-cycle: tests/cycle
@$(HELGRIND_COMMAND) tests/cycle
helgrind-cycle: tests/cycle
@$(HELGRIND_COMMAND) tests/cycle
-helgrind-mem: tests/testapp
- @$(HELGRIND_COMMAND) tests/testapp
+helgrind-mem: tests/
libmemcached-1.0/
testapp
+ @$(HELGRIND_COMMAND) tests/
libmemcached-1.0/
testapp
helgrind-atom: tests/atomsmasher
@$(HELGRIND_COMMAND) tests/atomsmasher
helgrind-atom: tests/atomsmasher
@$(HELGRIND_COMMAND) tests/atomsmasher