1 Return-Path: <dmitry.kurochkin@gmail.com>
\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 59D4D429E36
\r
6 for <notmuch@notmuchmail.org>; Wed, 16 Nov 2011 17:56:54 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5
\r
12 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
\r
13 FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
14 Received: from olra.theworths.org ([127.0.0.1])
\r
15 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id wubY3vjcvJ9l for <notmuch@notmuchmail.org>;
\r
17 Wed, 16 Nov 2011 17:56:53 -0800 (PST)
\r
18 Received: from mail-bw0-f53.google.com (mail-bw0-f53.google.com
\r
19 [209.85.214.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
20 (No client certificate requested)
\r
21 by olra.theworths.org (Postfix) with ESMTPS id D6488429E21
\r
22 for <notmuch@notmuchmail.org>; Wed, 16 Nov 2011 17:56:52 -0800 (PST)
\r
23 Received: by mail-bw0-f53.google.com with SMTP id q10so1456807bka.26
\r
24 for <notmuch@notmuchmail.org>; Wed, 16 Nov 2011 17:56:52 -0800 (PST)
\r
25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
\r
26 h=from:to:subject:date:message-id:x-mailer:in-reply-to:references;
\r
27 bh=zIFBh11+2n2NCyUwB6pKZvOchxenrFQQGCqoekohCMM=;
\r
28 b=LYLx8kbRMhT7TpAZR9RumttlRcDs6BC0DwcEbZdPxecQMtQ2rCoC+FhM64rZw3IBOR
\r
29 H0eqJ3lrKjfwkL5UhmMYLt+k5jNnYBTeIkT9W1/xrTZ0vb66DZCU2YIF3fIziFnAGWlf
\r
30 035WW2ZnxwNnDDl7qHM20v4BOhwgG0L/WvV8M=
\r
31 Received: by 10.205.126.13 with SMTP id gu13mr23839444bkc.114.1321495012568;
\r
32 Wed, 16 Nov 2011 17:56:52 -0800 (PST)
\r
33 Received: from localhost ([91.144.186.21])
\r
34 by mx.google.com with ESMTPS id cc2sm37989383bkb.8.2011.11.16.17.56.51
\r
35 (version=TLSv1/SSLv3 cipher=OTHER);
\r
36 Wed, 16 Nov 2011 17:56:52 -0800 (PST)
\r
37 From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>
\r
38 To: notmuch@notmuchmail.org
\r
39 Subject: [PATCH 2/9] test: set EMACS_SERVER variable only after dtach(1) was
\r
40 successfully started
\r
41 Date: Thu, 17 Nov 2011 05:56:19 +0400
\r
42 Message-Id: <1321494986-18998-3-git-send-email-dmitry.kurochkin@gmail.com>
\r
43 X-Mailer: git-send-email 1.7.7.2
\r
44 In-Reply-To: <1321494986-18998-1-git-send-email-dmitry.kurochkin@gmail.com>
\r
45 References: <1321494986-18998-1-git-send-email-dmitry.kurochkin@gmail.com>
\r
46 X-BeenThere: notmuch@notmuchmail.org
\r
47 X-Mailman-Version: 2.1.13
\r
49 List-Id: "Use and development of the notmuch mail system."
\r
50 <notmuch.notmuchmail.org>
\r
51 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
52 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
53 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
54 List-Post: <mailto:notmuch@notmuchmail.org>
\r
55 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
56 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
57 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
58 X-List-Received-Date: Thu, 17 Nov 2011 01:56:54 -0000
\r
60 Otherwise, we can set the EMACS_SERVER and return with an error. And
\r
61 subsequent calls to test_emacs would assume that emacs server is running.
\r
63 test/test-lib.sh | 5 +++--
\r
64 1 files changed, 3 insertions(+), 2 deletions(-)
\r
66 diff --git a/test/test-lib.sh b/test/test-lib.sh
\r
67 index 222b5e4..ff85848 100755
\r
68 --- a/test/test-lib.sh
\r
69 +++ b/test/test-lib.sh
\r
70 @@ -823,50 +823,51 @@ export NOTMUCH_CONFIG=$NOTMUCH_CONFIG
\r
71 # Here's what we are using here:
\r
73 # --no-init-file Don't load users ~/.emacs
\r
75 # --no-site-file Don't load the site-wide startup stuff
\r
77 # --directory Ensure that the local elisp sources are found
\r
79 # --load Force loading of notmuch.el and test-lib.el
\r
81 exec emacs --no-init-file --no-site-file \
\r
82 --directory "$TEST_DIRECTORY/../emacs" --load notmuch.el \
\r
83 --directory "$TEST_DIRECTORY" --load test-lib.el \
\r
86 chmod a+x "$TMP_DIRECTORY/run_emacs"
\r
90 if [ -z "$EMACS_SERVER" ]; then
\r
91 - EMACS_SERVER="notmuch-test-suite-$$"
\r
92 + server_name="notmuch-test-suite-$$"
\r
93 # start a detached session with an emacs server
\r
94 # user's TERM is given to dtach which assumes a minimally
\r
95 # VT100-compatible terminal -- and emacs inherits that
\r
96 TERM=$ORIGINAL_TERM dtach -n "$TMP_DIRECTORY/emacs-dtach-socket.$$" \
\r
97 sh -c "stty rows 24 cols 80; exec '$TMP_DIRECTORY/run_emacs' \
\r
98 --no-window-system \
\r
99 - --eval '(setq server-name \"$EMACS_SERVER\")' \
\r
100 + --eval '(setq server-name \"$server_name\")' \
\r
101 --eval '(server-start)' \
\r
102 --eval '(orphan-watchdog $$)'" || return
\r
103 + EMACS_SERVER="$server_name"
\r
104 # wait until the emacs server is up
\r
105 until test_emacs '()' 2>/dev/null; do
\r
110 emacsclient --socket-name="$EMACS_SERVER" --eval "(progn $@)"
\r
113 test_reset_state_ () {
\r
114 test_subtest_known_broken_=
\r
118 find_notmuch_path ()
\r
122 while [ -n "$dir" ]; do
\r