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

[awesomized/libmemcached] / tests / include.am

diff --git a/tests/include.am b/tests/include.am
index 3a8c8efab76012b40ee532ec5c04b45b5f3c9961..0ac1d8984f3b49172d95919b61a5b800c64cf2d8 100644 (file)
--- a/tests/include.am
+++ b/tests/include.am
@@ -13,10 +13,6 @@ 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
-
 EXTRA_DIST+= tests/cpp_example.cc
 
 noinst_HEADERS+= tests/exist.h
@@ -25,7 +21,7 @@ noinst_HEADERS+= tests/keys.hpp
 noinst_HEADERS+= tests/libmemcached_test_container.h
 noinst_HEADERS+= tests/libmemcached_world.h
 noinst_HEADERS+= tests/libmemcached_world_socket.h
-noinst_HEADERS+= tests/memc.h
+noinst_HEADERS+= tests/memc.hpp
 noinst_HEADERS+= tests/runner.h
 
 # Cycle should always run first
@@ -33,8 +29,7 @@ tests_cycle_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
 tests_cycle_CXXFLAGS= $(AM_CXXFLAGS)
 tests_cycle_CXXFLAGS+= ${PTHREAD_CFLAGS}
 tests_cycle_SOURCES= tests/cycle.cc
-tests_cycle_DEPENDENCIES= $(TESTS_LDADDS)
-tests_cycle_LDADD= $(tests_cycle_DEPENDENCIES)
+tests_cycle_LDADD= $(TESTS_LDADDS)
 tests_cycle_LDADD+= ${PTHREAD_LIBS}
 check_PROGRAMS+= tests/cycle
 noinst_PROGRAMS+= tests/cycle
@@ -53,8 +48,7 @@ tests_failure_SOURCES+= tests/libmemcached-1.0/generate.cc
 tests_failure_SOURCES+= tests/libmemcached-1.0/print.cc
 
 tests_failure_CXXFLAGS = $(AM_CXXFLAGS)
-tests_failure_DEPENDENCIES= $(TESTS_LDADDS)
-tests_failure_LDADD= $(tests_failure_DEPENDENCIES)
+tests_failure_LDADD= $(TESTS_LDADDS)
 check_PROGRAMS+= tests/failure
 noinst_PROGRAMS+= tests/failure
 
@@ -62,12 +56,11 @@ test-failure: tests/failure
        @tests/failure
 
 gdb-failure: tests/failure
-       @$(DEBUG_COMMAND) tests/failure
+       @$(GDB_COMMAND) tests/failure
 
 
 tests_testhashkit_SOURCES= tests/hashkit_functions.cc
-tests_testhashkit_DEPENDENCIES= libtest/libtest.la libhashkit/libhashkit.la $(TESTS_LDADDS)
-tests_testhashkit_LDADD= $(tests_testhashkit_DEPENDENCIES)
+tests_testhashkit_LDADD= libtest/libtest.la libhashkit/libhashkit.la $(TESTS_LDADDS)
 check_PROGRAMS+= tests/testhashkit
 noinst_PROGRAMS+= tests/testhashkit
 
@@ -77,8 +70,7 @@ test-hash: tests/testhashkit
 
 tests_hash_plus_SOURCES= tests/hash_plus.cc
 tests_hash_plus_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_hash_plus_DEPENDENCIES= $(tests_testhashkit_DEPENDENCIES)
-tests_hash_plus_LDADD= $(tests_testhashkit_DEPENDENCIES)
+tests_hash_plus_LDADD= $(tests_testhashkit_LDADD)
 check_PROGRAMS+= tests/hash_plus
 noinst_PROGRAMS+= tests/hash_plus
 
@@ -89,9 +81,6 @@ test: check
 test-mem: tests/libmemcached-1.0/testapp
        @tests/libmemcached-1.0/testapp
 
-test-sasl: tests/sasl
-       @tests/sasl
-
 test-atom: tests/atomsmasher
        @tests/atomsmasher
 
@@ -111,22 +100,19 @@ pahole-mem: tests/testapp
        @$(PAHOLE_COMMAND)  tests/testapp
 
 gdb-mem: tests/libmemcached-1.0/testapp
-       @$(DEBUG_COMMAND)  tests/libmemcached-1.0/testapp
-
-gdb-sasl: tests/sasl
-       @$(DEBUG_COMMAND)  tests/sasl
+       @$(GDB_COMMAND)  tests/libmemcached-1.0/testapp
 
 gdb-atom: tests/atomsmasher
-       @$(DEBUG_COMMAND) tests/atomsmasher
+       @$(GDB_COMMAND) tests/atomsmasher
 
 gdb-hash: tests/testhashkit
-       @$(DEBUG_COMMAND) tests/testhashkit
+       @$(GDB_COMMAND) tests/testhashkit
 
 gdb-hashplus: tests/hash_plus
-       @$(DEBUG_COMMAND) tests/hash_plus
+       @$(GDB_COMMAND) tests/hash_plus
 
 gdb-cycle: tests/cycle
-       @$(DEBUG_COMMAND) tests/cycle
+       @$(GDB_COMMAND) tests/cycle
 
 valgrind-cycle: tests/cycle
        $(VALGRIND_COMMAND) tests/cycle