mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-11-22 02:48:08 +01:00
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.
This commit is contained in:
parent
c96f5f29dd
commit
bed6022ed1
2 changed files with 9 additions and 1 deletions
|
@ -56,6 +56,13 @@ can be specified as follows:
|
||||||
|
|
||||||
make test OPTIONS="--verbose"
|
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
|
Skipping Tests
|
||||||
--------------
|
--------------
|
||||||
If, for any reason, you need to skip one or more tests, you can do so
|
If, for any reason, you need to skip one or more tests, you can do so
|
||||||
|
|
|
@ -50,6 +50,7 @@ TZ=UTC
|
||||||
TERM=dumb
|
TERM=dumb
|
||||||
export LANG LC_ALL PAGER TERM TZ
|
export LANG LC_ALL PAGER TERM TZ
|
||||||
GIT_TEST_CMP=${GIT_TEST_CMP:-diff -u}
|
GIT_TEST_CMP=${GIT_TEST_CMP:-diff -u}
|
||||||
|
TEST_EMACS=${TEST_EMACS:-${EMACS:-emacs}}
|
||||||
|
|
||||||
# Protect ourselves from common misconfiguration to export
|
# Protect ourselves from common misconfiguration to export
|
||||||
# CDPATH into the environment
|
# CDPATH into the environment
|
||||||
|
@ -897,7 +898,7 @@ export NOTMUCH_CONFIG=$NOTMUCH_CONFIG
|
||||||
#
|
#
|
||||||
# --load Force loading of notmuch.el and test-lib.el
|
# --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/../emacs" --load notmuch.el \
|
||||||
--directory "$TEST_DIRECTORY" --load test-lib.el \
|
--directory "$TEST_DIRECTORY" --load test-lib.el \
|
||||||
"\$@"
|
"\$@"
|
||||||
|
|
Loading…
Reference in a new issue