X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=test%2Fnotmuch-test;h=ca68dd416cfc17ab5132538b8fe36db37a6cbc5a;hb=c5356b9ed56e42d36ca18206155b62c94cfbd79d;hp=d6fdd3a5d7f3a07d2db111643c80e40fb29a5698;hpb=39408d0f7d71334c539327db5bbfe248cbab8e82;p=notmuch

diff --git a/test/notmuch-test b/test/notmuch-test
index d6fdd3a5..ca68dd41 100755
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@ -3,6 +3,7 @@
 # Run tests
 #
 # Copyright (c) 2005 Junio C Hamano
+# Copyright (c) 2010 Notmuch Developers
 #
 # Adapted from a Makefile to a shell script by Carl Worth (2010)
 
@@ -14,70 +15,24 @@ if [ ${BASH_VERSINFO[0]} -lt 4 ]; then
     exit 1
 fi
 
-cd $(dirname "$0")
+# Ensure NOTMUCH_SRCDIR and NOTMUCH_BUILDDIR are set.
+. $(dirname "$0")/export-dirs.sh || exit 1
 
-TESTS="
-  basic
-  help-test
-  compact
-  config
-  setup
-  new
-  count
-  insert
-  search
-  search-output
-  search-by-folder
-  search-position-overlap-bug
-  search-insufficient-from-quoting
-  search-limiting
-  excludes
-  tagging
-  json
-  sexp
-  text
-  multipart
-  thread-naming
-  raw
-  reply
-  reply-to-sender
-  dump-restore
-  uuencode
-  thread-order
-  author-order
-  from-guessing
-  long-id
-  encoding
-  emacs
-  emacs-large-search-buffer
-  emacs-subject-to-filename
-  maildir-sync
-  crypto
-  symbol-hiding
-  search-folder-coherence
-  atomicity
-  python
-  hooks
-  argument-parsing
-  emacs-test-functions
-  emacs-address-cleaning
-  emacs-hello
-  emacs-show
-  emacs-tree
-  missing-headers
-  hex-escaping
-  parse-time-string
-  search-date
-  thread-replies
-"
-TESTS=${NOTMUCH_TESTS:=$TESTS}
+TESTS=
+for test in $NOTMUCH_TESTS; do
+    TESTS="$TESTS $NOTMUCH_SRCDIR/test/$test"
+done
+
+if [[ -z "$TESTS" ]]; then
+    TESTS="$NOTMUCH_SRCDIR/test/T[0-9][0-9][0-9]-*.sh"
+fi
 
 # Clean up any results from a previous run
-rm -r test-results >/dev/null 2>/dev/null
+rm -rf $NOTMUCH_BUILDDIR/test/test-results
 
-# test for timeout utility
+# Test for timeout utility
 if command -v timeout >/dev/null; then
-    TEST_TIMEOUT_CMD="timeout 2m "
+    TEST_TIMEOUT_CMD="timeout 2m"
     echo "INFO: using 2 minute timeout for tests"
 else
     TEST_TIMEOUT_CMD=""
@@ -86,12 +41,13 @@ 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 $!
     # If the test failed without producing results, then it aborted,
     # so we should abort, too.
     RES=$?
-    if [[ $RES != 0 && ! -e "test-results/${test%.sh}" ]]; then
+    testname=$(basename $test .sh)
+    if [[ $RES != 0 && ! -e "$NOTMUCH_BUILDDIR/test/test-results/$testname" ]]; then
         exit $RES
     fi
 done
@@ -99,10 +55,10 @@ trap - HUP INT TERM
 
 # Report results
 echo
-./aggregate-results.sh test-results/*
+$NOTMUCH_SRCDIR/test/aggregate-results.sh $NOTMUCH_BUILDDIR/test/test-results/*
 ev=$?
 
 # Clean up
-rm -rf test-results corpus.mail
+rm -rf $NOTMUCH_BUILDDIR/test/test-results $NOTMUCH_BUILDDIR/test/corpora.mail
 
 exit $ev