X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=test%2Fnotmuch-test;h=bbabf288b2226c2120e055ec139f0b25ef2895db;hp=a06b5f059b32ea949afed56306a35f4f68bcfd86;hb=ed20210b6db0b237d48765351cb99b87be7a0509;hpb=0d67c52f4dda6c0902de58fc74d4caca9942d97c

diff --git a/test/notmuch-test b/test/notmuch-test
index a06b5f05..bbabf288 100755
--- a/test/notmuch-test
+++ b/test/notmuch-test
@@ -1,247 +1,70 @@
-#!/bin/bash
-set -e
+#!/usr/bin/env bash
 
-find_notmuch_binary ()
-{
-    dir=$1
-
-    while [ -n "$dir" ]; do
-	bin=$dir/notmuch
-	if [ -x $bin ]; then
-	    echo $bin
-	    return
-	fi
-	dir=$(dirname $dir)
-	if [ "$dir" = "/" ]; then
-	    break
-	fi
-    done
-
-    echo notmuch
-}
-
-# Generate a new message in the mail directory, with
-# a unique message ID and subject.
-#
-# The filename of the message generated is available as
-# $gen_msg_filename
+# Run tests
 #
-# This function supports named parameters with the bash syntax for
-# assigning a value to an associative array ([name]=value). The
-# supported parameters are:
+# Copyright (c) 2005 Junio C Hamano
 #
-#  [dir]=directory/of/choice
-#
-#	Generate the message in directory 'directory/of/choice' within
-#	the mail store. The directory will be created if necessary.
-gen_msg_cnt=0
-gen_msg_filename=""
-generate_message ()
-{
-    # This is our (bash-specific) magic for doing named parameters
-    local -A template="($@)"
-
-    gen_msg_cnt=$((gen_msg_cnt + 1))
-    gen_msg_name=msg-$(printf "%03d" $gen_msg_cnt)
-
-    if [ -z "${template[dir]}" ]; then
-	gen_msg_filename="${MAIL_DIR}/$gen_msg_name"
-    else
-	gen_msg_filename="${MAIL_DIR}/${template[dir]}/$gen_msg_name"
-	mkdir -p $(dirname $gen_msg_filename)
-    fi
-
-cat <<EOF >$gen_msg_filename
-From: Notmuch Test Suite <test_suite@notmuchmail.org>
-To: Notmuch Test Suite <test_suite@notmuchmail.org>
-Message-Id: <msg-${gen_msg_cnt}@notmuch-test-suite>
-Subject: Test message ${gen_msg_filename}
-Date: Tue, 05 Jan 2010 15:43:57 -0800
-
-This is just a test message at ${gen_msg_filename}
-EOF
-}
-
-do_sleep ()
-{
-    sleep 1
-}
-
-NOTMUCH_IGNORED_OUTPUT_REGEXP='^Processed [0-9]*( total)? file|Found [0-9]* total file'
-
-execute_expecting ()
-{
-    args=$1
-    expected=$2
-
-    output=$($NOTMUCH $args | grep -v -E -e "$NOTMUCH_IGNORED_OUTPUT_REGEXP")
-    if [ "$output" = "$expected" ]; then
-	echo "	PASS"
-    else
-	echo "	FAIL"
-	echo "	Expected output: $expected"
-	echo "	Actual output:   $output"
-    fi
-}
-
-TEST_DIR=$(pwd)/test.$$
-MAIL_DIR=${TEST_DIR}/mail
-export NOTMUCH_CONFIG=${TEST_DIR}/notmuch-config
-NOTMUCH=$(find_notmuch_binary $(pwd))
-
-rm -rf ${TEST_DIR}
-mkdir ${TEST_DIR}
-cd ${TEST_DIR}
-
-mkdir ${MAIL_DIR}
-
-cat <<EOF > ${NOTMUCH_CONFIG}
-[database]
-path=${MAIL_DIR}
-
-[user]
-name=Notmuch Test Suite
-primary_email=test_suite@notmuchmail.org
-EOF
-
-printf "Testing \"notmuch new\" in several variations:\n"
-printf " No new messages...\t\t"
-execute_expecting new "No new mail."
-
-printf " Single new message...\t\t"
-do_sleep
-generate_message
-execute_expecting new "Added 1 new message to the database."
-
-printf " Multiple new messages...\t"
-do_sleep
-generate_message
-generate_message
-execute_expecting new "Added 2 new messages to the database."
-
-printf " No new messages (non-empty DB)... "
-execute_expecting new "No new mail."
-
-printf " New directories...\t\t"
-rm -rf ${MAIL_DIR}/* ${MAIL_DIR}/.notmuch
-mkdir ${MAIL_DIR}/def
-mkdir ${MAIL_DIR}/ghi
-generate_message [dir]=def
-
-execute_expecting new "Added 1 new message to the database."
-
-printf " Alternate inode order...\t"
-
-rm -rf ${MAIL_DIR}/.notmuch
-mv ${MAIL_DIR}/ghi ${MAIL_DIR}/abc
-rm ${MAIL_DIR}/def/*
-generate_message [dir]=abc
-
-execute_expecting new "Added 1 new message to the database."
-
-printf " Message moved in...\t\t"
-rm -rf ${MAIL_DIR}/* ${MAIL_DIR}/.notmuch
-generate_message
-tmp_msg_filename=tmp/$gen_msg_filename
-mkdir -p $(dirname $tmp_msg_filename)
-mv $gen_msg_filename $tmp_msg_filename
-do_sleep
-$NOTMUCH new > /dev/null
-do_sleep
-mv $tmp_msg_filename $gen_msg_filename
-execute_expecting new "Added 1 new message to the database."
-
-printf " Renamed message...\t\t"
-
-do_sleep
-generate_message
-$NOTMUCH new > /dev/null
-do_sleep
-mv $gen_msg_filename ${gen_msg_filename}-renamed
-execute_expecting new "No new mail. Detected 1 file rename."
-
-printf " Deleted message...\t\t"
-
-do_sleep
-rm ${gen_msg_filename}-renamed
-execute_expecting new "No new mail. Removed 1 message."
-
-printf " Renamed directory...\t\t"
-
-do_sleep
-generate_message [dir]=dir
-generate_message [dir]=dir
-generate_message [dir]=dir
-
-$NOTMUCH new > /dev/null
-
-do_sleep
-mv ${MAIL_DIR}/dir ${MAIL_DIR}/dir-renamed
-
-execute_expecting new "No new mail. Detected 3 file renames."
-
-printf " Deleted directory...\t\t"
-
-do_sleep
-rm -rf ${MAIL_DIR}/dir-renamed
-
-execute_expecting new "No new mail. Removed 3 messages."
-
-printf " New directory (at end of list)... "
-
-do_sleep
-generate_message [dir]=zzz
-generate_message [dir]=zzz
-generate_message [dir]=zzz
-
-execute_expecting new "Added 3 new messages to the database."
-
-printf " Deleted directory (end of list)... "
-
-do_sleep
-rm -rf ${MAIL_DIR}/zzz
-
-execute_expecting new "No new mail. Removed 3 messages."
-
-printf " New symlink to directory...\t"
-
-rm -rf ${MAIL_DIR}/.notmuch
-mv ${MAIL_DIR} ${TEST_DIR}/actual_maildir
-
-mkdir ${MAIL_DIR}
-ln -s ${TEST_DIR}/actual_maildir ${MAIL_DIR}/symlink
-
-execute_expecting new "Added 1 new message to the database."
-
-printf " New symlink to a file...\t"
-do_sleep
-generate_message
-external_msg_filename=${TEST_DIR}/external/$(basename $gen_msg_filename)
-mkdir -p $(dirname $external_msg_filename)
-mv $gen_msg_filename $external_msg_filename
-ln -s $external_msg_filename $gen_msg_filename
-
-execute_expecting new "Added 1 new message to the database."
-
-printf " New two-level directory...\t"
-
-do_sleep
-generate_message [dir]=two/levels
-generate_message [dir]=two/levels
-generate_message [dir]=two/levels
-
-execute_expecting new "Added 3 new messages to the database."
-
-printf " Deleted two-level directory... "
-
-do_sleep
-rm -rf ${MAIL_DIR}/two
-
-execute_expecting new "No new mail. Removed 3 messages."
-
-cat <<EOF
-Notmuch test suite complete.
-
-Intermediate state can be examined in:
-	${TEST_DIR}
-EOF
+# Adapted from a Makefile to a shell script by Carl Worth (2010)
+
+if [ ${BASH_VERSINFO[0]} -lt 4 ]; then
+    echo "Error: The notmuch test suite requires a bash version >= 4.0"
+    echo "due to use of associative arrays within the test suite."
+    echo "Please try again with a newer bash (or help us fix the"
+    echo "test suite to be more portable). Thanks."
+    exit 1
+fi
+
+cd $(dirname "$0")
+
+TESTS="
+  basic
+  new
+  search
+  search-output
+  search-by-folder
+  search-position-overlap-bug
+  search-insufficient-from-quoting
+  tagging
+  json
+  multipart
+  thread-naming
+  raw
+  reply
+  dump-restore
+  uuencode
+  thread-order
+  author-order
+  from-guessing
+  long-id
+  encoding
+  emacs
+  emacs-large-search-buffer
+  maildir-sync
+  crypto
+  symbol-hiding
+  search-folder-coherence
+  atomicity
+"
+TESTS=${NOTMUCH_TESTS:=$TESTS}
+
+# Clean up any results from a previous run
+rm -r test-results >/dev/null 2>/dev/null
+
+# test for timeout utility
+if command -v timeout >/dev/null; then
+    TEST_TIMEOUT_CMD="timeout 2m "
+    echo "INFO: using 2 minute timeout for tests"
+else
+    TEST_TIMEOUT_CMD=""
+fi
+
+# Run the tests
+for test in $TESTS; do
+    $TEST_TIMEOUT_CMD ./$test "$@"
+done
+
+# Report results
+./aggregate-results.sh test-results/*
+
+# Clean up
+rm -rf test-results corpus.mail