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 2FD37431FD0
\r
6 for <notmuch@notmuchmail.org>; Thu, 10 Nov 2011 11:35:06 -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 U8UHGbJ59-kr for <notmuch@notmuchmail.org>;
\r
16 Thu, 10 Nov 2011 11:35:05 -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 BB79B431FB6
\r
20 for <notmuch@notmuchmail.org>; Thu, 10 Nov 2011 11:35:05 -0800 (PST)
\r
21 Received: from earth-doxen.imss.caltech.edu (localhost [127.0.0.1])
\r
22 by earth-doxen-postvirus (Postfix) with ESMTP id 6A6D166E0237
\r
23 for <notmuch@notmuchmail.org>; Thu, 10 Nov 2011 11:35:05 -0800 (PST)
\r
24 X-Spam-Scanned: at Caltech-IMSS on earth-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 earth-doxen-submit (Postfix) with ESMTP id A4C2166E02DA
\r
28 for <notmuch@notmuchmail.org>; Thu, 10 Nov 2011 11:35:03 -0800 (PST)
\r
29 Received: by finestructure.net (Postfix, from userid 1000)
\r
30 id B407B350; Thu, 10 Nov 2011 11:35:02 -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 env to set TMPDIR when running emacs in screen.
\r
34 Date: Thu, 10 Nov 2011 11:35:02 -0800
\r
35 Message-Id: <1320953702-16732-1-git-send-email-jrollins@finestructure.net>
\r
36 X-Mailer: git-send-email 1.7.7.1
\r
37 In-Reply-To: <20111110192836.GN2658@mit.edu>
\r
38 References: <20111110192836.GN2658@mit.edu>
\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 19:35:06 -0000
\r
53 This is to get around a bug where screen unsets TMPDIR. This causes
\r
54 problems for users who set TMPDIR to something other than it's default
\r
57 This just adds some comments over the previous patch.
\r
58 Thanks to Austin Clements for the suggestion.
\r
60 test/test-lib.sh | 7 ++++++-
\r
61 1 files changed, 6 insertions(+), 1 deletions(-)
\r
63 diff --git a/test/test-lib.sh b/test/test-lib.sh
\r
64 index c81c709..5ed6a96 100755
\r
65 --- a/test/test-lib.sh
\r
66 +++ b/test/test-lib.sh
\r
67 @@ -844,7 +844,12 @@ test_emacs () {
\r
68 if [ -z "$EMACS_SERVER" ]; then
\r
69 EMACS_SERVER="notmuch-test-suite-$$"
\r
70 # start a detached screen session with an emacs server
\r
71 - screen -S "$EMACS_SERVER" -d -m "$TMP_DIRECTORY/run_emacs" \
\r
72 + # The emacs server places its socket in TMPDIR, but ld.so unsets
\r
73 + # TMPDIR when loading setgid binaries like screen, so we must
\r
74 + # explicitly pass TMPDIR through to emacs.
\r
75 + screen -S "$EMACS_SERVER" -d -m \
\r
76 + env TMPDIR="$TMPDIR" \
\r
77 + "$TMP_DIRECTORY/run_emacs" \
\r
78 --no-window-system \
\r
79 --eval "(setq server-name \"$EMACS_SERVER\")" \
\r
80 --eval '(server-start)' \
\r