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 648751159842542813ce1b4b9a22003c535bd4b2..b90a5ef7d9f8559f33b833ecdf3bbe0697c7be02 100644
(file)
--- a/
tests/include.am
+++ b/
tests/include.am
@@
-14,6
+14,10
@@
if BUILD_LIBMEMCACHEDUTIL
TESTS_LDADDS+= libmemcached/libmemcachedutil.la
endif
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 \
noinst_HEADERS+= \
tests/hash_results.h \
tests/ketama_test_cases.h \
@@
-47,7
+51,11
@@
tests_testapp_DEPENDENCIES= \
tests/libtest.la \
libmemcached/libmemcachedinternal.la \
$(TESTS_LDADDS)
tests/libtest.la \
libmemcached/libmemcachedinternal.la \
$(TESTS_LDADDS)
-tests_testapp_LDADD= $(tests_testapp_DEPENDENCIES) $(LIBSASL)
+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_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX)
tests_testplus_SOURCES= tests/plus.cpp
tests_testplus_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX)
@@
-91,7
+99,7
@@
tests_memplus_LDADD = $(tests_memplus_DEPENDENCIES) $(LIBSASL)
test: check
test: check
-check-local:
test-docs
test-mem test-hash memcapable
+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"
test-x: check-local test-plus test-memcat test-memcp test-memrm test-memerror test-memdump test-memflush test-memstat