From 4a1741d39d31c8355d0bfb979f72535972affd35 Mon Sep 17 00:00:00 2001
From: Tomi Ollila <tomi.ollila@iki.fi>
Date: Fri, 11 Nov 2011 00:03:14 +0200
Subject: [PATCH] [PATCH] test: use dtach(1) instead of screen(1) in emacs
 tests.

---
 ae/30c6edc559b5c0f30e1277dcce03eca4cc583d | 78 +++++++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 ae/30c6edc559b5c0f30e1277dcce03eca4cc583d

diff --git a/ae/30c6edc559b5c0f30e1277dcce03eca4cc583d b/ae/30c6edc559b5c0f30e1277dcce03eca4cc583d
new file mode 100644
index 000000000..e9c83e7fd
--- /dev/null
+++ b/ae/30c6edc559b5c0f30e1277dcce03eca4cc583d
@@ -0,0 +1,78 @@
+Return-Path: <tomi.ollila@nixu.com>
+X-Original-To: notmuch@notmuchmail.org
+Delivered-To: notmuch@notmuchmail.org
+Received: from localhost (localhost [127.0.0.1])
+	by olra.theworths.org (Postfix) with ESMTP id C3670431FD0
+	for <notmuch@notmuchmail.org>; Thu, 10 Nov 2011 14:03:24 -0800 (PST)
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
+X-Spam-Flag: NO
+X-Spam-Score: 0
+X-Spam-Level: 
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
+	autolearn=disabled
+Received: from olra.theworths.org ([127.0.0.1])
+	by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
+	with ESMTP id ueUjkeS7sMku for <notmuch@notmuchmail.org>;
+	Thu, 10 Nov 2011 14:03:23 -0800 (PST)
+Received: from taco2.nixu.fi (taco2.nixu.fi [194.197.118.31])
+	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
+	(No client certificate requested)
+	by olra.theworths.org (Postfix) with ESMTPS id A9E96431FB6
+	for <notmuch@notmuchmail.org>; Thu, 10 Nov 2011 14:03:23 -0800 (PST)
+Received: from taco2.nixu.fi (taco2.nixu.fi [194.197.118.31])
+	by taco2.nixu.fi (8.14.3/8.14.3/Debian-5+lenny1) with ESMTP id
+	pAAM3E5m006489; Fri, 11 Nov 2011 00:03:14 +0200
+From: Tomi Ollila <tomi.ollila@iki.fi>
+To: Jameson Graef Rollins <jrollins@finestructure.net>,
+	Notmuch Mail <notmuch@notmuchmail.org>
+Subject: [PATCH] test: use dtach(1) instead of screen(1) in emacs tests.
+In-Reply-To: <1320953702-16732-1-git-send-email-jrollins@finestructure.net>
+References: <20111110192836.GN2658@mit.edu>
+	<1320953702-16732-1-git-send-email-jrollins@finestructure.net>
+User-Agent: Notmuch/0.9+23~g556c5fa (http://notmuchmail.org) Emacs/23.3.1
+	(i686-pc-linux-gnu)
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL
+	$[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F
+	!)g;OY^,BjTbr)Np:%c_o'jj,Z
+Date: Fri, 11 Nov 2011 00:03:14 +0200
+Message-ID: <yf6mxc3ab4t.fsf@taco2.nixu.fi>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=us-ascii
+X-BeenThere: notmuch@notmuchmail.org
+X-Mailman-Version: 2.1.13
+Precedence: list
+List-Id: "Use and development of the notmuch mail system."
+	<notmuch.notmuchmail.org>
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
+	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>
+List-Post: <mailto:notmuch@notmuchmail.org>
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
+	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
+X-List-Received-Date: Thu, 10 Nov 2011 22:03:24 -0000
+
+dtach is lighter than screen and is not setuid/setgid program so
+TMPDIR does not get reset by dynamic loader when executed.
+---
+ test/test-lib.sh |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/test-lib.sh b/test/test-lib.sh
+index c81c709..af723ad 100755
+--- a/test/test-lib.sh
++++ b/test/test-lib.sh
+@@ -844,8 +844,8 @@ test_emacs () {
+ 	if [ -z "$EMACS_SERVER" ]; then
+ 		EMACS_SERVER="notmuch-test-suite-$$"
+ 		# start a detached screen session with an emacs server
+-		screen -S "$EMACS_SERVER" -d -m "$TMP_DIRECTORY/run_emacs" \
+-			--no-window-system \
++		TERM=xterm dtach -n "$TMP_DIRECTORY/dtach-emacs-socket-$$" \
++			"$TMP_DIRECTORY/run_emacs" --no-window-system \
+ 			--eval "(setq server-name \"$EMACS_SERVER\")" \
+ 			--eval '(server-start)' \
+ 			--eval "(orphan-watchdog $$)" || return
+-- 
+1.5.6.5
+
-- 
2.26.2