projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge lp:~tangent-org/libmemcached/1.0-build Build: jenkins-Libmemcached-1.0-133
[m6w6/libmemcached]
/
tests
/
libmemcached-1.0
/
include.am
diff --git
a/tests/libmemcached-1.0/include.am
b/tests/libmemcached-1.0/include.am
index 5201653a0420a27f4f483f82c88926a32f95e4b1..228f72a06d5ee093bfedd021dfcf4cf3a951d3ba 100644
(file)
--- a/
tests/libmemcached-1.0/include.am
+++ b/
tests/libmemcached-1.0/include.am
@@
-20,16
+20,16
@@
noinst_HEADERS+= tests/ketama_test_cases_spy.h
noinst_HEADERS+= tests/libmemcached-1.0/all_tests.h
noinst_HEADERS+= tests/libmemcached-1.0/callback_counter.h
noinst_HEADERS+= tests/libmemcached-1.0/dump.h
noinst_HEADERS+= tests/libmemcached-1.0/all_tests.h
noinst_HEADERS+= tests/libmemcached-1.0/callback_counter.h
noinst_HEADERS+= tests/libmemcached-1.0/dump.h
+noinst_HEADERS+= tests/libmemcached-1.0/encoding_key.h
noinst_HEADERS+= tests/libmemcached-1.0/fetch_all_results.h
noinst_HEADERS+= tests/libmemcached-1.0/generate.h
noinst_HEADERS+= tests/libmemcached-1.0/fetch_all_results.h
noinst_HEADERS+= tests/libmemcached-1.0/generate.h
-noinst_HEADERS+= tests/libmemcached-1.0/encoding_key.h
noinst_HEADERS+= tests/libmemcached-1.0/haldenbrand.h
noinst_HEADERS+= tests/libmemcached-1.0/mem_functions.h
noinst_HEADERS+= tests/libmemcached-1.0/memcached_get.h
noinst_HEADERS+= tests/libmemcached-1.0/haldenbrand.h
noinst_HEADERS+= tests/libmemcached-1.0/mem_functions.h
noinst_HEADERS+= tests/libmemcached-1.0/memcached_get.h
+noinst_HEADERS+= tests/libmemcached-1.0/parser.h
noinst_HEADERS+= tests/libmemcached-1.0/setup_and_teardowns.h
noinst_HEADERS+= tests/libmemcached-1.0/stat.h
noinst_HEADERS+= tests/namespace.h
noinst_HEADERS+= tests/libmemcached-1.0/setup_and_teardowns.h
noinst_HEADERS+= tests/libmemcached-1.0/stat.h
noinst_HEADERS+= tests/namespace.h
-noinst_HEADERS+= tests/parser.h
noinst_HEADERS+= tests/pool.h
noinst_HEADERS+= tests/print.h
noinst_HEADERS+= tests/replication.h
noinst_HEADERS+= tests/pool.h
noinst_HEADERS+= tests/print.h
noinst_HEADERS+= tests/replication.h
@@
-38,6
+38,8
@@
noinst_HEADERS+= tests/string.h
noinst_HEADERS+= tests/touch.h
noinst_HEADERS+= tests/virtual_buckets.h
noinst_HEADERS+= tests/touch.h
noinst_HEADERS+= tests/virtual_buckets.h
+if HAVE_DTRACE
+else
# Test internals
tests_libmemcached_1_0_internals_CXXFLAGS=
tests_libmemcached_1_0_internals_DEPENDENCIES=
# Test internals
tests_libmemcached_1_0_internals_CXXFLAGS=
tests_libmemcached_1_0_internals_DEPENDENCIES=
@@
-47,17
+49,21
@@
tests_libmemcached_1_0_internals_SOURCES=
tests_libmemcached_1_0_internals_SOURCES+= tests/libmemcached-1.0/internals.cc
tests_libmemcached_1_0_internals_SOURCES+= tests/libmemcached-1.0/string.cc
tests_libmemcached_1_0_internals_CXXFLAGS+= $(AM_CXXFLAGS)
tests_libmemcached_1_0_internals_SOURCES+= tests/libmemcached-1.0/internals.cc
tests_libmemcached_1_0_internals_SOURCES+= tests/libmemcached-1.0/string.cc
tests_libmemcached_1_0_internals_CXXFLAGS+= $(AM_CXXFLAGS)
-tests_libmemcached_1_0_internals_CXXFLAGS+=
${PTHREAD_CFLAGS}
+tests_libmemcached_1_0_internals_CXXFLAGS+=
@PTHREAD_CFLAGS@
tests_libmemcached_1_0_internals_DEPENDENCIES+= libmemcachedinternal/libmemcachedinternal.la
tests_libmemcached_1_0_internals_DEPENDENCIES+= libtest/libtest.la
tests_libmemcached_1_0_internals_DEPENDENCIES+= libmemcachedinternal/libmemcachedutilinternal.la
tests_libmemcached_1_0_internals_LDADD+= libmemcachedinternal/libmemcachedinternal.la
tests_libmemcached_1_0_internals_DEPENDENCIES+= libmemcachedinternal/libmemcachedinternal.la
tests_libmemcached_1_0_internals_DEPENDENCIES+= libtest/libtest.la
tests_libmemcached_1_0_internals_DEPENDENCIES+= libmemcachedinternal/libmemcachedutilinternal.la
tests_libmemcached_1_0_internals_LDADD+= libmemcachedinternal/libmemcachedinternal.la
-tests_libmemcached_1_0_internals_LDADD+=
${PTHREAD_LIBS}
+tests_libmemcached_1_0_internals_LDADD+=
@PTHREAD_LIBS@
tests_libmemcached_1_0_internals_LDADD+= libmemcachedinternal/libmemcachedutilinternal.la
tests_libmemcached_1_0_internals_LDADD+= libtest/libtest.la
check_PROGRAMS+= tests/libmemcached-1.0/internals
noinst_PROGRAMS+= tests/libmemcached-1.0/internals
tests_libmemcached_1_0_internals_LDADD+= libmemcachedinternal/libmemcachedutilinternal.la
tests_libmemcached_1_0_internals_LDADD+= libtest/libtest.la
check_PROGRAMS+= tests/libmemcached-1.0/internals
noinst_PROGRAMS+= tests/libmemcached-1.0/internals
+test-internal: tests/libmemcached-1.0/internals
+ @tests/testplus
+
+endif
tests_libmemcached_1_0_testapp_CXXFLAGS=
tests_libmemcached_1_0_testapp_CFLAGS=
tests_libmemcached_1_0_testapp_CXXFLAGS=
tests_libmemcached_1_0_testapp_CFLAGS=
@@
-66,7
+72,7
@@
tests_libmemcached_1_0_testapp_DEPENDENCIES=
tests_libmemcached_1_0_testapp_LDADD=
tests_libmemcached_1_0_testapp_CXXFLAGS+= $(AM_CXXFLAGS)
tests_libmemcached_1_0_testapp_LDADD=
tests_libmemcached_1_0_testapp_CXXFLAGS+= $(AM_CXXFLAGS)
-tests_libmemcached_1_0_testapp_CXXFLAGS+=
${PTHREAD_CFLAGS}
+tests_libmemcached_1_0_testapp_CXXFLAGS+=
@PTHREAD_CFLAGS@
tests_libmemcached_1_0_testapp_CFLAGS+= $(AM_CFLAGS)
tests_libmemcached_1_0_testapp_CFLAGS+= $(NO_CONVERSION)
tests_libmemcached_1_0_testapp_CFLAGS+= $(NO_STRICT_ALIASING)
tests_libmemcached_1_0_testapp_CFLAGS+= $(AM_CFLAGS)
tests_libmemcached_1_0_testapp_CFLAGS+= $(NO_CONVERSION)
tests_libmemcached_1_0_testapp_CFLAGS+= $(NO_STRICT_ALIASING)
@@
-102,8
+108,8
@@
tests_libmemcached_1_0_testapp_DEPENDENCIES+= libtest/libtest.la
tests_libmemcached_1_0_testapp_DEPENDENCIES+= libhashkit/libhashkit.la
tests_libmemcached_1_0_testapp_DEPENDENCIES+= libmemcached/libmemcachedutil.la
tests_libmemcached_1_0_testapp_DEPENDENCIES+= libhashkit/libhashkit.la
tests_libmemcached_1_0_testapp_DEPENDENCIES+= libmemcached/libmemcachedutil.la
-tests_libmemcached_1_0_testapp_LDADD+=
$(LIBUUID_LDFLAGS)
-tests_libmemcached_1_0_testapp_LDADD+=
${PTHREAD_LIBS}
+tests_libmemcached_1_0_testapp_LDADD+=
@LIBUUID_LIB@
+tests_libmemcached_1_0_testapp_LDADD+=
@PTHREAD_LIBS@
tests_libmemcached_1_0_testapp_LDADD+= libmemcached/libmemcached.la
tests_libmemcached_1_0_testapp_LDADD+= libmemcached/libmemcachedutil.la
tests_libmemcached_1_0_testapp_LDADD+= libtest/libtest.la
tests_libmemcached_1_0_testapp_LDADD+= libmemcached/libmemcached.la
tests_libmemcached_1_0_testapp_LDADD+= libmemcached/libmemcachedutil.la
tests_libmemcached_1_0_testapp_LDADD+= libtest/libtest.la
@@
-118,7
+124,7
@@
tests_libmemcached_1_0_testsocket_SOURCES=
tests_libmemcached_1_0_testsocket_DEPENDENCIES=
tests_libmemcached_1_0_testsocket_LDADD=
tests_libmemcached_1_0_testsocket_DEPENDENCIES=
tests_libmemcached_1_0_testsocket_LDADD=
-tests_libmemcached_1_0_testsocket_CXXFLAGS+=
${PTHREAD_CFLAGS}
+tests_libmemcached_1_0_testsocket_CXXFLAGS+=
@PTHREAD_CFLAGS@
tests_libmemcached_1_0_testsocket_CXXFLAGS+= $(AM_CXXFLAGS)
tests_libmemcached_1_0_testsocket_CFLAGS+= $(AM_CFLAGS)
tests_libmemcached_1_0_testsocket_CFLAGS+= $(NO_CONVERSION)
tests_libmemcached_1_0_testsocket_CXXFLAGS+= $(AM_CXXFLAGS)
tests_libmemcached_1_0_testsocket_CFLAGS+= $(AM_CFLAGS)
tests_libmemcached_1_0_testsocket_CFLAGS+= $(NO_CONVERSION)
@@
-158,8
+164,8
@@
tests_libmemcached_1_0_testsocket_DEPENDENCIES+= libtest/libtest.la
tests_libmemcached_1_0_testsocket_DEPENDENCIES+= libhashkit/libhashkit.la
tests_libmemcached_1_0_testsocket_DEPENDENCIES+= libmemcached/libmemcachedutil.la
tests_libmemcached_1_0_testsocket_DEPENDENCIES+= libhashkit/libhashkit.la
tests_libmemcached_1_0_testsocket_DEPENDENCIES+= libmemcached/libmemcachedutil.la
-tests_libmemcached_1_0_testsocket_LDADD+=
$(LIBUUID_LDFLAGS)
-tests_libmemcached_1_0_testsocket_LDADD+=
${PTHREAD_LIBS}
+tests_libmemcached_1_0_testsocket_LDADD+=
@LIBUUID_LIB@
+tests_libmemcached_1_0_testsocket_LDADD+=
@PTHREAD_LIBS@
tests_libmemcached_1_0_testsocket_LDADD+= libmemcached/libmemcached.la
tests_libmemcached_1_0_testsocket_LDADD+= libmemcached/libmemcachedutil.la
tests_libmemcached_1_0_testsocket_LDADD+= libtest/libtest.la
tests_libmemcached_1_0_testsocket_LDADD+= libmemcached/libmemcached.la
tests_libmemcached_1_0_testsocket_LDADD+= libmemcached/libmemcachedutil.la
tests_libmemcached_1_0_testsocket_LDADD+= libtest/libtest.la
@@
-168,6
+174,12
@@
tests_libmemcached_1_0_testsocket_LDADD+= libhashkit/libhashkit.la
check_PROGRAMS+= tests/libmemcached-1.0/testsocket
noinst_PROGRAMS+= tests/libmemcached-1.0/testsocket
check_PROGRAMS+= tests/libmemcached-1.0/testsocket
noinst_PROGRAMS+= tests/libmemcached-1.0/testsocket
+test-socket: tests/libmemcached-1.0/testsocket
+ @tests/libmemcached-1.0/testsocket
+
+gdb-socket: tests/libmemcached-1.0/testsocket
+ @$(GDB_COMMAND) tests/libmemcached-1.0/testsocket
+
tests_libmemcached_1_0_sasl_SOURCES=
tests_libmemcached_1_0_sasl_DEPENDENCIES=
tests_libmemcached_1_0_sasl_LDADD=
tests_libmemcached_1_0_sasl_SOURCES=
tests_libmemcached_1_0_sasl_DEPENDENCIES=
tests_libmemcached_1_0_sasl_LDADD=
@@
-175,7
+187,7
@@
tests_libmemcached_1_0_sasl_CXXFLAGS=
tests_libmemcached_1_0_sasl_CFLAGS=
tests_libmemcached_1_0_sasl_CXXFLAGS+= $(AM_CXXFLAGS)
tests_libmemcached_1_0_sasl_CFLAGS=
tests_libmemcached_1_0_sasl_CXXFLAGS+= $(AM_CXXFLAGS)
-tests_libmemcached_1_0_sasl_CXXFLAGS+=
${PTHREAD_CFLAGS}
+tests_libmemcached_1_0_sasl_CXXFLAGS+=
@PTHREAD_CFLAGS@
tests_libmemcached_1_0_sasl_CFLAGS+= $(AM_CFLAGS)
tests_libmemcached_1_0_sasl_CFLAGS+= $(NO_CONVERSION)
tests_libmemcached_1_0_sasl_CFLAGS+= $(NO_STRICT_ALIASING)
tests_libmemcached_1_0_sasl_CFLAGS+= $(AM_CFLAGS)
tests_libmemcached_1_0_sasl_CFLAGS+= $(NO_CONVERSION)
tests_libmemcached_1_0_sasl_CFLAGS+= $(NO_STRICT_ALIASING)
@@
-200,7
+212,7
@@
tests_libmemcached_1_0_sasl_SOURCES+= tests/libmemcached-1.0/generate.cc
tests_libmemcached_1_0_sasl_DEPENDENCIES+= libmemcached/libmemcached.la
tests_libmemcached_1_0_sasl_DEPENDENCIES+= libtest/libtest.la
tests_libmemcached_1_0_sasl_DEPENDENCIES+= libmemcached/libmemcached.la
tests_libmemcached_1_0_sasl_DEPENDENCIES+= libtest/libtest.la
-tests_libmemcached_1_0_sasl_LDADD+=
${PTHREAD_LIBS}
+tests_libmemcached_1_0_sasl_LDADD+=
@PTHREAD_LIBS@
tests_libmemcached_1_0_sasl_LDADD+= libmemcached/libmemcached.la
tests_libmemcached_1_0_sasl_LDADD+= libmemcached/libmemcachedutil.la
tests_libmemcached_1_0_sasl_LDADD+= libtest/libtest.la
tests_libmemcached_1_0_sasl_LDADD+= libmemcached/libmemcached.la
tests_libmemcached_1_0_sasl_LDADD+= libmemcached/libmemcachedutil.la
tests_libmemcached_1_0_sasl_LDADD+= libtest/libtest.la
@@
-209,6
+221,12
@@
tests_libmemcached_1_0_sasl_LDADD+= libhashkit/libhashkit.la
check_PROGRAMS+= tests/libmemcached-1.0/sasl
noinst_PROGRAMS+= tests/libmemcached-1.0/sasl
check_PROGRAMS+= tests/libmemcached-1.0/sasl
noinst_PROGRAMS+= tests/libmemcached-1.0/sasl
+test-sasl: tests/libmemcached-1.0/sasl
+ @tests/libmemcached-1.0/sasl
+
+gdb-sasl: tests/libmemcached-1.0/sasl
+ @$(GDB_COMMAND) tests/libmemcached-1.0/sasl
+
tests_atomsmasher_SOURCES=
tests_atomsmasher_DEPENDENCIES=
tests_atomsmasher_LDADD=
tests_atomsmasher_SOURCES=
tests_atomsmasher_DEPENDENCIES=
tests_atomsmasher_LDADD=
@@
-264,3
+282,15
@@
tests_testplus_DEPENDENCIES+= $(TESTS_LDADDS)
tests_testplus_LDADD+= $(tests_testplus_DEPENDENCIES)
check_PROGRAMS+= tests/testplus
noinst_PROGRAMS+= tests/testplus
tests_testplus_LDADD+= $(tests_testplus_DEPENDENCIES)
check_PROGRAMS+= tests/testplus
noinst_PROGRAMS+= tests/testplus
+
+test-plus: tests/testplus
+ @tests/testplus
+
+gdb-plus: tests/testplus
+ $(GDB_COMMAND) tests/testplus
+
+valgrind-plus: tests/testplus
+ @$(VALGRIND_COMMAND) tests/testplus
+
+helgrind-plus: tests/testplus
+ @$(HELGRIND_COMMAND) tests/testplus