test: add external prereqs to many emacs tests

The tests fail otherwise.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>

diff --git a/test/T310-emacs.sh b/test/T310-emacs.sh
index 78ac19a8655c150bd428657fcd387336b7b689d4..e64627c6729fab8a1606730f7f036bdccd5db0ba 100755 (executable)
--- a/test/T310-emacs.sh
+++ b/test/T310-emacs.sh
@@ -5,6 +5,7 @@ test_description="emacs interface"
 
 EXPECTED=$NOTMUCH_SRCDIR/test/emacs.expected-output
 
+test_require_emacs
 add_email_corpus
 
 # syntax errors in test-lib.el cause mysterious failures

diff --git a/test/T350-crypto.sh b/test/T350-crypto.sh
index 0aada4dfe7023a15384f121fb794f97126d9a30a..ae1d6a98bc9134ee74b49f6c9c344c7f53f04bbe 100755 (executable)
--- a/test/T350-crypto.sh
+++ b/test/T350-crypto.sh
@@ -9,6 +9,7 @@ test_description='PGP/MIME signature verification and decryption'
 
 ##################################################
 
+test_require_emacs
 add_gnupg_home
 
 test_begin_subtest "emacs delivery of signed message"

diff --git a/test/T355-smime.sh b/test/T355-smime.sh
index 8b2b52be032a34ec539ee673ffa8fee23dc8dc3d..12ac2525345a2196e6ce8f8ecc2036d3c15eeb7a 100755 (executable)
--- a/test/T355-smime.sh
+++ b/test/T355-smime.sh
@@ -3,6 +3,7 @@
 test_description='S/MIME signature verification and decryption'
 . $(dirname "$0")/test-lib.sh || exit 1
 
+test_require_emacs
 test_require_external_prereq openssl
 test_require_external_prereq gpgsm
 

diff --git a/test/T357-index-decryption.sh b/test/T357-index-decryption.sh
index 1ed5f28cfc455bd74d30f0f047032f75595c2886..b81bdfe192805f9d7a5ae2a1cd43af692405add8 100755 (executable)
--- a/test/T357-index-decryption.sh
+++ b/test/T357-index-decryption.sh
@@ -7,6 +7,7 @@ test_description='indexing decrypted mail'
 
 ##################################################
 
+test_require_emacs
 add_gnupg_home
 
 # create a test encrypted message

diff --git a/test/T450-emacs-show.sh b/test/T450-emacs-show.sh
index cca56ca32cd6875e6da4dbcd7b3b90932b3e3bef..bd76d378e8fd693641ddd106a2299dde018dea1d 100755 (executable)
--- a/test/T450-emacs-show.sh
+++ b/test/T450-emacs-show.sh
@@ -5,6 +5,7 @@ test_description="emacs notmuch-show view"
 
 EXPECTED=$NOTMUCH_SRCDIR/test/emacs-show.expected-output
 
+test_require_emacs
 add_email_corpus
 
 test_begin_subtest "Hiding Original Message region at beginning of a message"

diff --git a/test/T460-emacs-tree.sh b/test/T460-emacs-tree.sh
index cb2c90b80991ec4a1bf31529bc1f6e74493eefdd..195485c156d312f46680792284ec62048faee828 100755 (executable)
--- a/test/T460-emacs-tree.sh
+++ b/test/T460-emacs-tree.sh
@@ -5,6 +5,7 @@ test_description="emacs tree view interface"
 
 EXPECTED=$NOTMUCH_SRCDIR/test/emacs-tree.expected-output
 
+test_require_emacs
 add_email_corpus
 
 test_begin_subtest "Basic notmuch-tree view in emacs"

diff --git a/test/T730-emacs-forwarding.sh b/test/T730-emacs-forwarding.sh
index 45e61568ec62540b03094562dfb3aa1c0def08f8..5d6ac9f052b15583407e9117fdb1a6d11b29ec94 100755 (executable)
--- a/test/T730-emacs-forwarding.sh
+++ b/test/T730-emacs-forwarding.sh
@@ -3,6 +3,8 @@
 test_description="emacs forwarding"
 . $(dirname "$0")/test-lib.sh || exit 1
 
+test_require_emacs
+
 test_begin_subtest "Forward setting the correct references header"
 # Check that, when forwarding a message, the new message has
 # a References-header pointing to the original (forwarded) message.

diff --git a/test/test-lib.sh b/test/test-lib.sh
index 72ac2e896604f7d976dd0cc7325036a9c581ec07..88e2a82f7337e9bf0a755b70187e8bbc342bada1 100644 (file)
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -114,6 +114,12 @@ unset ALTERNATE_EDITOR
 unset EMAIL
 unset NAME
 
+test_require_emacs () {
+    test_require_external_prereq emacs
+    test_require_external_prereq ${TEST_EMACSCLIENT}
+    test_require_external_prereq dtach
+}
+
 add_gnupg_home ()
 {
     [ -e "${GNUPGHOME}/gpg.conf" ] && return