Updating files for hudson, sorted bzignore for Trond.

diff --git a/.bzrignore b/.bzrignore
index 507ac4a16c1590267c322a1397fec425a5d9ae36..f5a3bcf20f58cdac82cfe5333ead33324d3c09d9 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -1,14 +1,14 @@
 *.lo
-*/.deps
-*/.libs
-*/.dirstamp
+*/*.l[oa]
+*/*/*.l[oa]
 */*/.deps
-*/*/.libs
 */*/.dirstamp
+*/*/.libs
+*/.deps
+*/.dirstamp
+*/.libs
 */Makefile
 */Makefile.in
-*/*.l[oa]
-*/*/*.l[oa]
 *TAGS
 INSTALL
 Makefile
@@ -41,6 +41,11 @@ configure
 docs/*.[13]
 example/memcached_light
 libmemcached-*.tar.gz
+libmemcached-0.30-1.src.rpm
+libmemcached-0.30-1.x86_64.rpm
+libmemcached-0.31-1.src.rpm
+libmemcached-0.31-1.x86_64.rpm
+libmemcached-?.??/
 libmemcached/memcached_configure.h
 libtool
 libtool.m4
@@ -60,8 +65,3 @@ tests/startservers
 tests/testapp
 tests/testplus
 tests/udptest
-libmemcached-0.30-1.src.rpm
-libmemcached-0.30-1.x86_64.rpm
-libmemcached-0.31-1.src.rpm
-libmemcached-0.31-1.x86_64.rpm
-libmemcached-?.??/

diff --git a/Makefile.am b/Makefile.am
index eeab710a4aad9c6588ec01b86f597461c911f021..7aa35f03531ab01fabfec37370181d4dc745b859 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,7 @@ test: all
 test-extended: all
        @(cd tests; ${MAKE} test-extended)
 
-valgrind:
+valgrind: all
        @(cd tests; ${MAKE} valgrind)
 
 test-no-outputdiff:
@@ -34,3 +34,11 @@ generic:
        cp ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .
 
 rpm: all dist generic fedora
+
+clean-merge:
+       find ./ | grep \.orig | xargs rm
+       find ./ | grep \.rej | xargs rm
+       find ./ | grep \~$ | xargs rm
+
+hudson-valgrind: all
+       @(cd tests; ${MAKE} hudson-valgrind)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 30174b7d8700002219bf13a02240861dc8e4a2e6..6c51d28f8ebcba48369260bd9eb2980a370bcc49 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -98,3 +98,6 @@ helgrind-slap:
        $(LIBTOOL) --mode=execute valgrind --tool=helgrind  ${top_builddir}/clients/memslap --server=localhost --concurrency=30
 
 test-no-outputdiff: test
+
+hudson-valgrind:
+       $(LIBTOOL) --mode=execute valgrind --leak-check=yes --show-reachable=yes --log-file=/tmp/valgrind.out testapp