[PATCH 1/2] test-lib: Use --no-window-system in run_emacs to help diagnose problems.

[PATCH 1/2] test-lib: Use --no-window-system in run_emacs to help diagnose problems.

[David Edmondson]

---
 test/test-lib.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/test/test-lib.sh b/test/test-lib.sh
index b5e346c..41a3144 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -898,6 +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 \
+	--no-window-system \
 	--directory "$TEST_DIRECTORY/../emacs" --load notmuch.el \
 	--directory "$TEST_DIRECTORY" --load test-lib.el \
 	"\$@"
@@ -917,7 +918,6 @@ test_emacs () {
 		# VT100-compatible terminal -- and emacs inherits that
 		TERM=$ORIGINAL_TERM dtach -n "$TEST_TMPDIR/emacs-dtach-socket.$$" \
 			sh -c "stty rows 24 cols 80; exec '$TMP_DIRECTORY/run_emacs' \
-				--no-window-system \
 				--eval '(setq server-name \"$server_name\")' \
 				--eval '(server-start)' \
 				--eval '(orphan-watchdog $$)'" || return
-- 
1.7.7.3

[PATCH 2/2] test-lib: Allow the user to override which emacs binary is used.

[David Edmondson]

Specify when running the tests:
	make EMACS=emacs23 test
---
 test/test-lib.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/test/test-lib.sh b/test/test-lib.sh
index 41a3144..53aa885 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -897,7 +897,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 ${EMACS:-emacs} --no-init-file --no-site-file \
 	--no-window-system \
 	--directory "$TEST_DIRECTORY/../emacs" --load notmuch.el \
 	--directory "$TEST_DIRECTORY" --load test-lib.el \
-- 
1.7.7.3

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

[David Bremner]

From: David Bremner <bremner@debian.org>

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 version allows the emacs version to be passed either from the
environment or via a make argument. It also adds some brief documentation

 test/README      |    7 +++++++
 test/test-lib.sh |    3 ++-
 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/test/README b/test/README
index 7b2e96d..bde6db0 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 b5e346c..8edf256 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 \
 	"\$@"
-- 
1.7.7.3

Re: [PATCH] test: allow user to choose which emacs to run tests with.

[David Edmondson]

[-- Attachment #1: Type: text/plain, Size: 12 bytes --]

Looks good.

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: [PATCH] test: allow user to choose which emacs to run tests with.

[Tomi Ollila]

On Wed, 28 Dec 2011 13:08:21 -0400, David Bremner <david@tethera.net> wrote:
> From: David Bremner <bremner@debian.org>
> 
> 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
> 

+1

Re: [PATCH] test: allow user to choose which emacs to run tests with.

[David Bremner]

On Wed, 28 Dec 2011 13:08:21 -0400, David Bremner <david@tethera.net> wrote:
> From: David Bremner <bremner@debian.org>
> 
> 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.

pushed.

d