From: David Bremner <bremner@debian.org>
Date: Sun, 27 Nov 2011 05:15:20 +0000 (-0800)
Subject: Merge branch 'release'
X-Git-Tag: 0.11_rc1~96
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=ac8576de63b4383aef597e1db5af939e3b46594c;hp=-c

Merge branch 'release'
---

ac8576de63b4383aef597e1db5af939e3b46594c
diff --combined test/notmuch-test
index 6c65ed7a,5aced5ce..ba28ff39
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@@ -18,6 -18,7 +18,7 @@@ cd $(dirname "$0"
  
  TESTS="
    basic
+   help-test
    new
    count
    search
@@@ -60,13 -61,10 +61,13 @@@ els
      TEST_TIMEOUT_CMD=""
  fi
  
 +trap 'e=$?; kill $!; exit $e' HUP INT TERM
  # Run the tests
  for test in $TESTS; do
 -    $TEST_TIMEOUT_CMD ./$test "$@"
 +    $TEST_TIMEOUT_CMD ./$test "$@" &
 +    wait $!
  done
 +trap - HUP INT TERM
  
  # Report results
  ./aggregate-results.sh test-results/*