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 B1111431E64
\r
6 for <notmuch@notmuchmail.org>; Mon, 25 Nov 2013 09:08:40 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\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 MlkgFY7NpFcC for <notmuch@notmuchmail.org>;
\r
16 Mon, 25 Nov 2013 09:08:34 -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 D63D5431FD0
\r
19 for <notmuch@notmuchmail.org>; Mon, 25 Nov 2013 09:08:33 -0800 (PST)
\r
20 Received: by guru.guru-group.fi (Postfix, from userid 501)
\r
21 id 3EB4E100064; Mon, 25 Nov 2013 19:08:28 +0200 (EET)
\r
22 From: Tomi Ollila <tomi.ollila@iki.fi>
\r
23 To: notmuch@notmuchmail.org
\r
24 Subject: [PATCH 2/3] test: print empty line at the beginning of test script,
\r
26 Date: Mon, 25 Nov 2013 19:08:18 +0200
\r
27 Message-Id: <1385399299-12936-2-git-send-email-tomi.ollila@iki.fi>
\r
28 X-Mailer: git-send-email 1.8.0
\r
29 In-Reply-To: <1385399299-12936-1-git-send-email-tomi.ollila@iki.fi>
\r
30 References: <1384288868-23903-1-git-send-email-tomi.ollila@iki.fi>
\r
31 <1385399299-12936-1-git-send-email-tomi.ollila@iki.fi>
\r
32 Cc: tomi.ollila@iki.fi
\r
33 X-BeenThere: notmuch@notmuchmail.org
\r
34 X-Mailman-Version: 2.1.13
\r
36 List-Id: "Use and development of the notmuch mail system."
\r
37 <notmuch.notmuchmail.org>
\r
38 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
39 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
40 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
41 List-Post: <mailto:notmuch@notmuchmail.org>
\r
42 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
43 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
44 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
45 X-List-Received-Date: Mon, 25 Nov 2013 17:08:40 -0000
\r
47 In preparation for quiet mode print empty line before writing the
\r
48 test description. This is done now in function designed for it --
\r
49 it will also be called when test fails.
\r
51 test/notmuch-test | 1 +
\r
52 test/test-lib.sh | 12 +++++++++---
\r
53 test/test.expected-output/test-verbose-no | 1 +
\r
54 test/test.expected-output/test-verbose-yes | 1 +
\r
55 4 files changed, 12 insertions(+), 3 deletions(-)
\r
57 diff --git a/test/notmuch-test b/test/notmuch-test
\r
58 index 18593f6..d6fdd3a 100755
\r
59 --- a/test/notmuch-test
\r
60 +++ b/test/notmuch-test
\r
61 @@ -96,10 +96,11 @@ for test in $TESTS; do
\r
68 ./aggregate-results.sh test-results/*
\r
72 rm -rf test-results corpus.mail
\r
73 diff --git a/test/test-lib.sh b/test/test-lib.sh
\r
74 index 6e47545..34e0db6 100644
\r
75 --- a/test/test-lib.sh
\r
76 +++ b/test/test-lib.sh
\r
77 @@ -188,11 +188,19 @@ if test "$help" = "t"
\r
79 echo "Tests ${test_description}"
\r
83 -echo $this_test: "Testing ${test_description}"
\r
84 +test_description_printed=
\r
85 +print_test_description ()
\r
87 + test -z "$test_description_printed" || return 0
\r
89 + echo $this_test: "Testing ${test_description}"
\r
90 + test_description_printed=1
\r
92 +print_test_description
\r
98 @@ -977,12 +985,10 @@ test_done () {
\r
99 echo "fixed $test_fixed" >> $test_results_path
\r
100 echo "broken $test_broken" >> $test_results_path
\r
101 echo "failed $test_failure" >> $test_results_path
\r
102 echo "" >> $test_results_path
\r
106 [ -n "$EMACS_SERVER" ] && test_emacs '(kill-emacs)'
\r
108 if [ "$test_failure" = "0" ]; then
\r
109 if [ "$test_broken" = "0" ]; then
\r
110 rm -rf "$remove_tmp"
\r
111 diff --git a/test/test.expected-output/test-verbose-no b/test/test.expected-output/test-verbose-no
\r
112 index 0bca754..1a2ff61 100644
\r
113 --- a/test/test.expected-output/test-verbose-no
\r
114 +++ b/test/test.expected-output/test-verbose-no
\r
117 test-verbose: Testing the verbosity options of the test framework itself.
\r
118 PASS print something in test_expect_success and pass
\r
119 FAIL print something in test_expect_success and fail
\r
121 echo "hello stdout" &&
\r
122 diff --git a/test/test.expected-output/test-verbose-yes b/test/test.expected-output/test-verbose-yes
\r
123 index ebe5187..d25466e 100644
\r
124 --- a/test/test.expected-output/test-verbose-yes
\r
125 +++ b/test/test.expected-output/test-verbose-yes
\r
128 test-verbose: Testing the verbosity options of the test framework itself.
\r
131 PASS print something in test_expect_success and pass
\r