From: Tomi Ollila <tomi.ollila@iki.fi>
Date: Tue, 12 Nov 2013 20:41:07 +0000 (+0200)
Subject: [PATCH 2/3] test: print empty line at the beginning of test script, not at end
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bb33204a58af03d50871dfcd82a67c6231b7491f;p=notmuch-archives.git

[PATCH 2/3] test: print empty line at the beginning of test script, not at end
---

diff --git a/14/abc5a69afa4e17c2509f5c4658b191425b3c29 b/14/abc5a69afa4e17c2509f5c4658b191425b3c29
new file mode 100644
index 000000000..06a334983
--- /dev/null
+++ b/14/abc5a69afa4e17c2509f5c4658b191425b3c29
@@ -0,0 +1,115 @@
+Return-Path: <too@guru-group.fi>
+X-Original-To: notmuch@notmuchmail.org
+Delivered-To: notmuch@notmuchmail.org
+Received: from localhost (localhost [127.0.0.1])
+	by olra.theworths.org (Postfix) with ESMTP id E93A3431E84
+	for <notmuch@notmuchmail.org>; Tue, 12 Nov 2013 12:41:23 -0800 (PST)
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
+X-Spam-Flag: NO
+X-Spam-Score: 0
+X-Spam-Level: 
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
+	autolearn=disabled
+Received: from olra.theworths.org ([127.0.0.1])
+	by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
+	with ESMTP id 68FqNHCEfbKZ for <notmuch@notmuchmail.org>;
+	Tue, 12 Nov 2013 12:41:17 -0800 (PST)
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])
+	by olra.theworths.org (Postfix) with ESMTP id 15781431FD7
+	for <notmuch@notmuchmail.org>; Tue, 12 Nov 2013 12:41:17 -0800 (PST)
+Received: by guru.guru-group.fi (Postfix, from userid 501)
+	id 9681D1000E5; Tue, 12 Nov 2013 22:41:12 +0200 (EET)
+From: Tomi Ollila <tomi.ollila@iki.fi>
+To: notmuch@notmuchmail.org
+Subject: [PATCH 2/3] test: print empty line at the beginning of test script,
+	not at end
+Date: Tue, 12 Nov 2013 22:41:07 +0200
+Message-Id: <1384288868-23903-2-git-send-email-tomi.ollila@iki.fi>
+X-Mailer: git-send-email 1.8.0
+In-Reply-To: <1384288868-23903-1-git-send-email-tomi.ollila@iki.fi>
+References: <1384288868-23903-1-git-send-email-tomi.ollila@iki.fi>
+Cc: tomi.ollila@iki.fi
+X-BeenThere: notmuch@notmuchmail.org
+X-Mailman-Version: 2.1.13
+Precedence: list
+List-Id: "Use and development of the notmuch mail system."
+	<notmuch.notmuchmail.org>
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
+	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>
+List-Post: <mailto:notmuch@notmuchmail.org>
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
+	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
+X-List-Received-Date: Tue, 12 Nov 2013 20:41:24 -0000
+
+In preparation for quiet mode print empty line before writing the
+test description. This is done now in function designed for it --
+it will also be called when test fails.
+---
+ test/notmuch-test                          | 1 +
+ test/test-lib.sh                           | 9 ++++++---
+ test/test.expected-output/test-verbose-no  | 1 +
+ test/test.expected-output/test-verbose-yes | 1 +
+ 4 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/test/notmuch-test b/test/notmuch-test
+index 18593f6..d6fdd3a 100755
+--- a/test/notmuch-test
++++ b/test/notmuch-test
+@@ -98,6 +98,7 @@ done
+ trap - HUP INT TERM
+ 
+ # Report results
++echo
+ ./aggregate-results.sh test-results/*
+ ev=$?
+ 
+diff --git a/test/test-lib.sh b/test/test-lib.sh
+index 808bb7f..e022e46 100644
+--- a/test/test-lib.sh
++++ b/test/test-lib.sh
+@@ -190,7 +190,12 @@ then
+ 	exit 0
+ fi
+ 
+-echo $this_test: "Testing ${test_description}"
++print_test_description ()
++{
++	echo
++	echo $this_test: "Testing ${test_description}"
++}
++print_test_description
+ 
+ exec 5>&1
+ 
+@@ -968,8 +973,6 @@ test_done () {
+ 	echo "failed $test_failure" >> $test_results_path
+ 	echo "" >> $test_results_path
+ 
+-	echo
+-
+ 	[ -n "$EMACS_SERVER" ] && test_emacs '(kill-emacs)'
+ 
+ 	if [ "$test_failure" = "0" ]; then
+diff --git a/test/test.expected-output/test-verbose-no b/test/test.expected-output/test-verbose-no
+index 0bca754..1a2ff61 100644
+--- a/test/test.expected-output/test-verbose-no
++++ b/test/test.expected-output/test-verbose-no
+@@ -1,3 +1,4 @@
++
+ test-verbose: Testing the verbosity options of the test framework itself.
+  PASS   print something in test_expect_success and pass
+  FAIL   print something in test_expect_success and fail
+diff --git a/test/test.expected-output/test-verbose-yes b/test/test.expected-output/test-verbose-yes
+index ebe5187..d25466e 100644
+--- a/test/test.expected-output/test-verbose-yes
++++ b/test/test.expected-output/test-verbose-yes
+@@ -1,3 +1,4 @@
++
+ test-verbose: Testing the verbosity options of the test framework itself.
+ hello stdout
+ hello stderr
+-- 
+1.8.3.1
+