[PATCH] test: use dtach(1) instead of screen(1) in emacs tests.

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