From: David Edmondson <dme@dme.org>
Date: Tue, 24 Jan 2012 16:14:04 +0000 (+0000)
Subject: test: Don't return the result of checking for running emacs to the tester.
X-Git-Tag: debian/0.12_rc1-1~161
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=2903b32f79dcf7789a2b015c48194cb40ac71462;hp=7430a42e23ee775818f84ed75f417302da694152;ds=sidebyside

test: Don't return the result of checking for running emacs to the tester.

When checking for a running emacs, test_emacs evaluates the empty list
'()'. This returns 'nil' when emacs is running, which is then
prepended to the actual test result. Given that it is not part of the
actual test output the test harness can incorrectly report test
failure (or success).
---

diff --git a/test/test-lib.sh b/test/test-lib.sh
index 0da60fbb..82c686ca 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -926,7 +926,7 @@ test_emacs () {
 				--eval '(orphan-watchdog $$)'" || return
 		EMACS_SERVER="$server_name"
 		# wait until the emacs server is up
-		until test_emacs '()' 2>/dev/null; do
+		until test_emacs '()' >/dev/null 2>/dev/null; do
 			sleep 1
 		done
 	fi