Merging bzr://gaz.tangent.org/libmemcached/build/ to Build branch

[awesomized/libmemcached] / tests / include.am

diff --git a/tests/include.am b/tests/include.am
index bfdb36b882a94f7f47d39f309a6575547b18fa11..96cbd70bffaa3314b3271e9070ccee135203d75c 100644 (file)
--- a/tests/include.am
+++ b/tests/include.am
@@ -24,7 +24,8 @@ EXTRA_DIST+= \
 noinst_HEADERS+= \
                 tests/exist.h \
                 tests/hash_results.h \
-                tests/libmemcached_world.h
+                tests/libmemcached_world.h \
+                tests/libmemcached_world_socket.h
 
 # Cycle should always run first
 tests_cycle_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
@@ -66,9 +67,6 @@ test: check
 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
        @tests/libmemcached-1.0/testapp
 
@@ -96,7 +94,7 @@ test-memcapable: tests/var 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
@@ -123,8 +121,8 @@ gdb-failure: tests/failure
 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
@@ -147,8 +145,8 @@ valgrind-hashplus: tests/hash_plus
 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