1 Return-Path: <too@guru-group.fi>
\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 3597F431FAF
\r
6 for <notmuch@notmuchmail.org>; Mon, 13 Jan 2014 12:38:26 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=1.312 tagged_above=-999 required=5
\r
12 tests=[GAPPY_SUBJECT=1.312] 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 KsrLXsn8CTo3 for <notmuch@notmuchmail.org>;
\r
16 Mon, 13 Jan 2014 12:38:21 -0800 (PST)
\r
17 Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])
\r
18 by olra.theworths.org (Postfix) with ESMTP id 8939B431FAE
\r
19 for <notmuch@notmuchmail.org>; Mon, 13 Jan 2014 12:38:21 -0800 (PST)
\r
20 Received: by guru.guru-group.fi (Postfix, from userid 501)
\r
21 id A4E1B1001E5; Mon, 13 Jan 2014 22:38:13 +0200 (EET)
\r
22 From: Tomi Ollila <tomi.ollila@iki.fi>
\r
23 To: notmuch@notmuchmail.org
\r
24 Subject: [PATCH 1/1] test: leave T\d\d\d- in variable $this_test and introduce
\r
26 Date: Mon, 13 Jan 2014 22:38:11 +0200
\r
27 Message-Id: <1389645491-7600-1-git-send-email-tomi.ollila@iki.fi>
\r
28 X-Mailer: git-send-email 1.8.0
\r
29 In-Reply-To: <1389280739-31930-1-git-send-email-tomi.ollila@iki.fi>
\r
30 References: <1389280739-31930-1-git-send-email-tomi.ollila@iki.fi>
\r
31 Cc: tomi.ollila@iki.fi
\r
32 X-BeenThere: notmuch@notmuchmail.org
\r
33 X-Mailman-Version: 2.1.13
\r
35 List-Id: "Use and development of the notmuch mail system."
\r
36 <notmuch.notmuchmail.org>
\r
37 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
38 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
39 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
40 List-Post: <mailto:notmuch@notmuchmail.org>
\r
41 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
42 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
43 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
44 X-List-Received-Date: Mon, 13 Jan 2014 20:38:26 -0000
\r
46 Script `notmuch-test` expects the results file have T\d\d\d- part
\r
47 intact so the results files (and some test output files) are now named
\r
50 The T\d\d\d- part is dropped in new variable $this_test_bare which is used
\r
51 in progress informational messages and when loading .el files in emacs
\r
52 tests (whenever $this_test_bare.el exists).
\r
55 This is an alternative to
\r
57 id:1389641156-3365-1-git-send-email-tomi.ollila@iki.fi
\r
59 I think this is better.
\r
61 test/test-lib.sh | 6 +++---
\r
62 1 file changed, 3 insertions(+), 3 deletions(-)
\r
64 diff --git a/test/test-lib.sh b/test/test-lib.sh
\r
65 index 487075e..78af170 100644
\r
66 --- a/test/test-lib.sh
\r
67 +++ b/test/test-lib.sh
\r
68 @@ -27,7 +27,7 @@ shopt -u xpg_echo
\r
71 this_test=${this_test%.sh}
\r
72 -this_test=${this_test#T[0-9][0-9][0-9]-}
\r
73 +this_test_bare=${this_test#T[0-9][0-9][0-9]-}
\r
75 # if --tee was passed, write the output not only to the terminal, but
\r
76 # additionally to the file test-results/$BASENAME.out, too.
\r
77 @@ -196,7 +196,7 @@ print_test_description ()
\r
79 test -z "$test_description_printed" || return 0
\r
81 - echo $this_test: "Testing ${test_description}"
\r
82 + echo $this_test_bare: "Testing ${test_description}"
\r
83 test_description_printed=1
\r
85 if [ -z "$NOTMUCH_TEST_QUIET" ]
\r
86 @@ -1085,7 +1085,7 @@ test_emacs () {
\r
87 test -z "$missing_dependencies" || return
\r
89 if [ -z "$EMACS_SERVER" ]; then
\r
90 - emacs_tests="${this_test}.el"
\r
91 + emacs_tests="${this_test_bare}.el"
\r
92 if [ -f "$TEST_DIRECTORY/$emacs_tests" ]; then
\r
93 load_emacs_tests="--eval '(load \"$emacs_tests\")'"
\r