Merge lp:~tangent-org/libmemcached/1.0-build/ Build: jenkins-Libmemcached-164

[awesomized/libmemcached] / tests / libmemcached-1.0 / include.am

diff --git a/tests/libmemcached-1.0/include.am b/tests/libmemcached-1.0/include.am
index 6ffc2986190652334245325519dce8a832c181e4..a9077c81818249eb53c3cb223e6b9d417e36ce89 100644 (file)
--- a/tests/libmemcached-1.0/include.am
+++ b/tests/libmemcached-1.0/include.am
@@ -38,6 +38,8 @@ noinst_HEADERS+= tests/string.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=
@@ -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_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_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
 
+test-internal: tests/libmemcached-1.0/internals
+       @tests/testplus
+
+endif
 
 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_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)
@@ -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_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
@@ -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_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)
@@ -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_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
@@ -172,16 +178,15 @@ test-socket: tests/libmemcached-1.0/testsocket
        @tests/libmemcached-1.0/testsocket
 
 gdb-socket: tests/libmemcached-1.0/testsocket
-       @$(DEBUG_COMMAND) 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_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)
@@ -203,10 +208,7 @@ tests_libmemcached_1_0_sasl_SOURCES+= tests/libmemcached-1.0/callback_counter.cc
 tests_libmemcached_1_0_sasl_SOURCES+= tests/libmemcached-1.0/fetch_all_results.cc
 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_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
@@ -215,6 +217,12 @@ tests_libmemcached_1_0_sasl_LDADD+= libhashkit/libhashkit.la
 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=
@@ -275,7 +283,7 @@ test-plus: tests/testplus
        @tests/testplus
 
 gdb-plus: tests/testplus
-       $(DEBUG_COMMAND) tests/testplus
+       $(GDB_COMMAND) tests/testplus
 
 valgrind-plus: tests/testplus
        @$(VALGRIND_COMMAND) tests/testplus