From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>
Date: Sun, 29 Jan 2012 03:36:02 +0000 (+0400)
Subject: test: auto load elisp tests file in test_emacs if available
X-Git-Tag: debian/0.12_rc1-1~99
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=754ddbb578175b986b10099cb4a11517080579f7

test: auto load elisp tests file in test_emacs if available

This allows us to simplify shell part of tests written in elisp.
---

diff --git a/test/test-lib.sh b/test/test-lib.sh
index 81583284..0174e93f 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -943,6 +943,12 @@ test_emacs () {
 	test -z "$missing_dependencies" || return
 
 	if [ -z "$EMACS_SERVER" ]; then
+		emacs_tests="$(basename $0).el"
+		if [ -f "$TEST_DIRECTORY/$emacs_tests" ]; then
+			load_emacs_tests="--eval '(load \"$emacs_tests\")'"
+		else
+			load_emacs_tests=
+		fi
 		server_name="notmuch-test-suite-$$"
 		# start a detached session with an emacs server
 		# user's TERM is given to dtach which assumes a minimally
@@ -950,6 +956,7 @@ test_emacs () {
 		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 \
+				$load_emacs_tests \
 				--eval '(setq server-name \"$server_name\")' \
 				--eval '(server-start)' \
 				--eval '(orphan-watchdog $$)'" || return