lib: replace deprecated n_q_search_messages with status returning version

[notmuch] / test / notmuch-test

diff --git a/test/notmuch-test b/test/notmuch-test
index b8437127c01fccc98c6f9be595f6cd1b8b0ebb5c..e7d3151ce8cbb528c68d6526ba4c39a035d5a1eb 100755 (executable)
--- 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,16 +15,16 @@ if [ ${BASH_VERSINFO[0]} -lt 4 ]; then
     exit 1
 fi
 
-cd $(dirname "$0")
+cd "$(dirname "$0")"
 
-TESTS=${NOTMUCH_TESTS:-`echo T[0-9][0-9][0-9]-*.sh`}
+TESTS=${NOTMUCH_TESTS:-T[0-9][0-9][0-9]-*.sh}
 
 # Clean up any results from a previous run
-rm -r test-results >/dev/null 2>/dev/null
+rm -rf 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=""