From: David Bremner <bremner@debian.org>
Date: Wed, 28 Dec 2011 17:08:21 +0000 (-0400)
Subject: test: allow user to choose which emacs to run tests with.
X-Git-Tag: debian/0.12_rc1-1~257
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=bed6022ed1076803d89260762dd4d90e639f2756

test: allow user to choose which emacs to run tests with.

As we start to pay more attention to emacs24, it helps to be able to
select a different version of emacs to run the tests with to verify
version specific bugs.

A separate variable TEST_EMACS is needed to avoid being overwritten by the
make variable EMACS in Makefile.config

For what it's worth, the value of emacs is chosen at the time
tmp.emacs/run_emacs is created, so is fixed for all subtests.
---

diff --git a/test/README b/test/README
index 7b2e96d4..bde6db0c 100644
--- a/test/README
+++ b/test/README
@@ -56,6 +56,13 @@ can be specified as follows:
 
 	make test OPTIONS="--verbose"
 
+You can choose an emacs binary to run the tests in one of the
+following ways.
+
+	TEST_EMACS=my-special-emacs make test
+	TEST_EMACS=my-special-emacs ./emacs
+	make test TEST_EMACS=my-special-emacs
+
 Skipping Tests
 --------------
 If, for any reason, you need to skip one or more tests, you can do so
diff --git a/test/test-lib.sh b/test/test-lib.sh
index b5e346c0..8edf256e 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -50,6 +50,7 @@ TZ=UTC
 TERM=dumb
 export LANG LC_ALL PAGER TERM TZ
 GIT_TEST_CMP=${GIT_TEST_CMP:-diff -u}
+TEST_EMACS=${TEST_EMACS:-${EMACS:-emacs}}
 
 # Protect ourselves from common misconfiguration to export
 # CDPATH into the environment
@@ -897,7 +898,7 @@ export NOTMUCH_CONFIG=$NOTMUCH_CONFIG
 #
 # --load		Force loading of notmuch.el and test-lib.el
 
-exec emacs --no-init-file --no-site-file \
+exec ${TEST_EMACS} --no-init-file --no-site-file \
 	--directory "$TEST_DIRECTORY/../emacs" --load notmuch.el \
 	--directory "$TEST_DIRECTORY" --load test-lib.el \
 	"\$@"