1 Return-Path: <jrollins@finestructure.net>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 86AC4429E25
\r
6 for <notmuch@notmuchmail.org>; Thu, 10 Nov 2011 14:22:20 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id Pq9mwFFMeWUr for <notmuch@notmuchmail.org>;
\r
16 Thu, 10 Nov 2011 14:22:20 -0800 (PST)
\r
17 Received: from outgoing-mail.its.caltech.edu (outgoing-mail.its.caltech.edu
\r
19 by olra.theworths.org (Postfix) with ESMTP id 0C12A431FD0
\r
20 for <notmuch@notmuchmail.org>; Thu, 10 Nov 2011 14:22:20 -0800 (PST)
\r
21 Received: from fire-doxen.imss.caltech.edu (localhost [127.0.0.1])
\r
22 by fire-doxen-postvirus (Postfix) with ESMTP id 7738B328118
\r
23 for <notmuch@notmuchmail.org>; Thu, 10 Nov 2011 14:22:19 -0800 (PST)
\r
24 X-Spam-Scanned: at Caltech-IMSS on fire-doxen by amavisd-new
\r
25 Received: from finestructure.net (cpe-76-174-136-149.socal.res.rr.com
\r
26 [76.174.136.149]) (Authenticated sender: jrollins)
\r
27 by fire-doxen-submit (Postfix) with ESMTP id 65A3232811A
\r
28 for <notmuch@notmuchmail.org>; Thu, 10 Nov 2011 14:22:17 -0800 (PST)
\r
29 Received: by finestructure.net (Postfix, from userid 1000)
\r
30 id 113D62E6; Thu, 10 Nov 2011 14:22:17 -0800 (PST)
\r
31 From: Jameson Graef Rollins <jrollins@finestructure.net>
\r
32 To: Notmuch Mail <notmuch@notmuchmail.org>
\r
33 Subject: [PATCH] test: use dtach(1) instead of screen(1) in emacs tests.
\r
34 Date: Thu, 10 Nov 2011 14:22:17 -0800
\r
35 Message-Id: <1320963737-1666-1-git-send-email-jrollins@finestructure.net>
\r
36 X-Mailer: git-send-email 1.7.7.1
\r
37 In-Reply-To: <yf6mxc3ab4t.fsf@taco2.nixu.fi>
\r
38 References: <yf6mxc3ab4t.fsf@taco2.nixu.fi>
\r
39 X-BeenThere: notmuch@notmuchmail.org
\r
40 X-Mailman-Version: 2.1.13
\r
42 List-Id: "Use and development of the notmuch mail system."
\r
43 <notmuch.notmuchmail.org>
\r
44 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
45 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
46 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
47 List-Post: <mailto:notmuch@notmuchmail.org>
\r
48 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
49 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
50 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
51 X-List-Received-Date: Thu, 10 Nov 2011 22:22:20 -0000
\r
53 From: Tomi Ollila <tomi.ollila@iki.fi>
\r
55 dtach is lighter than screen and is not setuid/setgid program so
\r
56 TMPDIR does not get reset by dynamic loader when executed.
\r
58 Signed-off-by: Jameson Graef Rollins <jrollins@finestructure.net>
\r
60 This tweaks the original patch slightly by removing the no-longer needed
\r
63 test/test-lib.sh | 5 ++---
\r
64 1 files changed, 2 insertions(+), 3 deletions(-)
\r
66 diff --git a/test/test-lib.sh b/test/test-lib.sh
\r
67 index c81c709..c0fe037 100755
\r
68 --- a/test/test-lib.sh
\r
69 +++ b/test/test-lib.sh
\r
70 @@ -50,8 +50,6 @@ TZ=UTC
\r
72 export LANG LC_ALL PAGER TERM TZ
\r
73 GIT_TEST_CMP=${GIT_TEST_CMP:-diff -u}
\r
74 -export SCREENRC=/dev/null
\r
75 -export SYSSCREENRC=/dev/null
\r
77 # Protect ourselves from common misconfiguration to export
\r
78 # CDPATH into the environment
\r
79 @@ -844,7 +842,8 @@ test_emacs () {
\r
80 if [ -z "$EMACS_SERVER" ]; then
\r
81 EMACS_SERVER="notmuch-test-suite-$$"
\r
82 # start a detached screen session with an emacs server
\r
83 - screen -S "$EMACS_SERVER" -d -m "$TMP_DIRECTORY/run_emacs" \
\r
84 + TERM=xterm dtach -n "$TMP_DIRECTORY/dtach-emacs-socket-$$" \
\r
85 + "$TMP_DIRECTORY/run_emacs" \
\r
86 --no-window-system \
\r
87 --eval "(setq server-name \"$EMACS_SERVER\")" \
\r
88 --eval '(server-start)' \
\r