Merge up for version.

diff --git a/ChangeLog b/ChangeLog
index f522e4ce3b221bae924ac26fa3627c0a60b51739..8afdf7db8aef67e7cc606b5f9d34315a25db4546 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
-0.51
-
+0.51 Thu Jul 21 11:08:58 PDT 2011
   * memcached_callback_set() now takes its data argument as const
-
+  * Update to tests.
+  * Fix in parser for port number.
 
 0.50 Mon Jun 20 10:36:57 PDT 2011
  * Updates to C++ interface 

diff --git a/tests/include.am b/tests/include.am
index b8b2cb80b28641bb8e7f29efb7a83f7f60e8d07d..93f26bed0dc697c9604398bf2b83db3c973fbde6 100644 (file)
--- a/tests/include.am
+++ b/tests/include.am
@@ -238,46 +238,26 @@ valgrind-memerror: clients/memerror
        @echo "Testing memerror"
        @$(VALGRIND_COMMAND) clients/memerror 0 > /dev/null
 
-
-
-
-
-MEMSLAP_COMMAND= clients/memslap
-
-MEM_COMMAND= tests/testapp
-
-TESTPLUS_COMMAND= tests/testplus
-
-HASHPLUS_COMMAND= tests/hashplus
-
-CYCLE_COMMAND= tests/cycle
-
-ATOM_COMMAND= tests/atomsmasher
-
-UDP_COMMAND= tests/testudp
-
-HASH_COMMAND= tests/testhashkit
-
 test-mem: tests/var tests/testapp
        @tests/testapp
 
 test-udp: tests/var tests/testudp
-       $(UDP_COMMAND)
+       @tests/testudp
 
 test-atom: tests/var tests/atomsmasher
-       $(ATOM_COMMAND)
+       @tests/atomsmasher
 
 test-plus: tests/var tests/testplus
-       $(TESTPLUS_COMMAND)
+       @tests/testplus
 
 test-hash: tests/var tests/testhashkit
-       $(HASH_COMMAND)
+       @tests/testhashkit
 
-test-hashplus: tests/var tests/hashplus
-       $(HASHPLUS_COMMAND)
+test-hashplus: tests/var tests/hash_plus
+       @tests/hash_plus
 
 test-cycle: tests/var tests/cycle
-       $(CYCLE_COMMAND)
+       @tests/cycle
 
 pahole-mem: tests/testapp
        @$(PAHOLE_COMMAND)  tests/testapp
@@ -286,70 +266,70 @@ gdb-mem: tests/testapp
        @$(DEBUG_COMMAND)  tests/testapp
 
 gdb-atom: tests/atomsmasher
-       $(DEBUG_COMMAND)  $(UDP_COMMAND)
+       @$(DEBUG_COMMAND) tests/testudp
 
 gdb-udp: tests/testudp
-       $(DEBUG_COMMAND)  $(ATOM_COMMAND)
+       @$(DEBUG_COMMAND) tests/atomsmasher
 
 gdb-plus: tests/testplus
-       $(DEBUG_COMMAND)  $(TESTPLUS_COMMAND)
+       $(DEBUG_COMMAND) tests/testplus
 
 gdb-hash: tests/testhashkit
-       $(DEBUG_COMMAND) $(HASH_COMMAND)
+       @$(DEBUG_COMMAND) tests/testhashkit
 
-gdb-hashplus: tests/hashplus
-       $(DEBUG_COMMAND) $(HASHPLUS_COMMAND)
+gdb-hashplus: tests/hash_plus
+       @$(DEBUG_COMMAND) tests/hash_plus
 
 gdb-cycle: tests/cycle
-       $(DEBUG_COMMAND) $(CYCLE_COMMAND)
+       @$(DEBUG_COMMAND) tests/cycle
 
 gdb-memslap: clients/memslap
-       $(DEBUG_COMMAND)  $(MEMSLAP_COMMAND)
+       @$(DEBUG_COMMAND) clients/memslap
 
 valgrind-cycle: tests/cycle
-       $(VALGRIND_COMMAND)  $(CYCLE_COMMAND)
+       $(VALGRIND_COMMAND) tests/cycle
 
 valgrind-mem: tests/testapp
        @$(VALGRIND_COMMAND) tests/testapp
 
 valgrind-atom: tests/atomsmasher
-       $(VALGRIND_COMMAND)  $(ATOM_COMMAND)
+       $(VALGRIND_COMMAND) tests/atomsmasher
 
 valgrind-udp: tests/testudp
-       $(VALGRIND_COMMAND)  $(UDP_COMMAND)
+       $(VALGRIND_COMMAND) tests/testudp
 
 valgrind-plus: tests/testplus
-       $(VALGRIND_COMMAND)  $(TESTPLUS_COMMAND)
+       @$(VALGRIND_COMMAND) tests/testplus
 
 valgrind-hash: tests/testhashkit
-       $(VALGRIND_COMMAND) $(HASH_COMMAND)
+       @$(VALGRIND_COMMAND) tests/testhashkit
 
-valgrind-hashplus: tests/hashplus
-       $(VALGRIND_COMMAND) $(HASHPLUS_COMMAND)
+valgrind-hashplus: tests/hash_plus
+       @$(VALGRIND_COMMAND) tests/hash_plus
 
 PHONY += valgrind
 valgrind: valgrind-cycle valgrind-mem valgrind-udp valgrind-plus valgrind-hash valgrind-hashplus
 
 helgrind-cycle: tests/cycle
-       $(HELGRIND_COMMAND)  $(CYCLE_COMMAND)
+       @$(HELGRIND_COMMAND) tests/cycle
 
 helgrind-mem: tests/testapp
        @$(HELGRIND_COMMAND) tests/testapp
 
 helgrind-atom: tests/atomsmasher
-       $(HELGRIND_COMMAND)  $(ATOM_COMMAND)
+       @$(HELGRIND_COMMAND) tests/atomsmasher
 
 helgrind-udp: tests/testudp
-       $(HELGRIND_COMMAND)  $(UDP_COMMAND)
+       @$(HELGRIND_COMMAND) tests/testudp
 
 helgrind-plus: tests/testplus
-       $(HELGRIND_COMMAND)  $(TESTPLUS_COMMAND)
+       @$(HELGRIND_COMMAND) tests/testplus
 
 helgrind-hash: tests/testhashkit
-       $(HELGRIND_COMMAND) $(HASH_COMMAND)
+       @$(HELGRIND_COMMAND) tests/testhashkit
 
-helgrind-hashplus: tests/hashplus
-       $(HELGRIND_COMMAND) $(HASHPLUS_COMMAND)
+helgrind-hashplus: tests/hash_plus
+       @$(HELGRIND_COMMAND) tests/hash_plus
 
 .PHONY += helgrind
 helgrind: helgrind-cycle helgrind-mem helgrind-udp helgrind-plus helgrind-hash helgrind-hashplus
@@ -371,4 +351,4 @@ callgrind:
 test-no-outputdiff: test
 
 hudson-valgrind: tests/testapp
-       $(VALGRIND_COMMAND) --log-file=tests/valgrind.out $(MEM_COMMAND)
+       $(VALGRIND_COMMAND) --log-file=tests/valgrind.out tests/testapp