[PATCH 2/5] test: Add trailing newline to error messages

diff --git a/a5/0e0c154fcef37f77a9836186b127124e708669 b/a5/0e0c154fcef37f77a9836186b127124e708669
new file mode 100644 (file)
index 0000000..d710110
--- /dev/null
+++ b/a5/0e0c154fcef37f77a9836186b127124e708669
@@ -0,0 +1,82 @@
+Return-Path: <sojkam1@fel.cvut.cz>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 83F2540DBE6\r
+       for <notmuch@notmuchmail.org>; Sun, 14 Nov 2010 13:54:53 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.9\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.9 tagged_above=-999 required=5\r
+       tests=[BAYES_00=-1.9] autolearn=ham\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id f7ay51leQ85N for <notmuch@notmuchmail.org>;\r
+       Sun, 14 Nov 2010 13:54:41 -0800 (PST)\r
+Received: from max.feld.cvut.cz (max.feld.cvut.cz [147.32.192.36])\r
+       by olra.theworths.org (Postfix) with ESMTP id 8BE5140DDC6\r
+       for <notmuch@notmuchmail.org>; Sun, 14 Nov 2010 13:54:41 -0800 (PST)\r
+Received: from localhost (unknown [192.168.200.4])\r
+       by max.feld.cvut.cz (Postfix) with ESMTP id E528E3CFE73;\r
+       Sun, 14 Nov 2010 22:54:40 +0100 (CET)\r
+X-Virus-Scanned: IMAP AMAVIS\r
+Received: from max.feld.cvut.cz ([192.168.200.1])\r
+       by localhost (styx.feld.cvut.cz [192.168.200.4]) (amavisd-new,\r
+       port 10044)\r
+       with ESMTP id hN1wGJrp7ouU; Sun, 14 Nov 2010 22:54:39 +0100 (CET)\r
+Received: from imap.feld.cvut.cz (imap.feld.cvut.cz [147.32.192.34])\r
+       by max.feld.cvut.cz (Postfix) with ESMTP id 9D4DC19F3336;\r
+       Sun, 14 Nov 2010 22:54:39 +0100 (CET)\r
+Received: from steelpick.2x.cz (unknown [213.29.198.144])\r
+       (Authenticated sender: sojkam1)\r
+       by imap.feld.cvut.cz (Postfix) with ESMTPSA id 95446FA004;\r
+       Sun, 14 Nov 2010 22:54:39 +0100 (CET)\r
+Received: from wsh by steelpick.2x.cz with local (Exim 4.72)\r
+       (envelope-from <sojkam1@fel.cvut.cz>)\r
+       id 1PHkX1-0002P0-5G; Sun, 14 Nov 2010 22:54:39 +0100\r
+From: Michal Sojka <sojkam1@fel.cvut.cz>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/5] test: Add trailing newline to error messages\r
+Date: Sun, 14 Nov 2010 22:54:29 +0100\r
+Message-Id: <1289771672-9204-2-git-send-email-sojkam1@fel.cvut.cz>\r
+X-Mailer: git-send-email 1.7.2.3\r
+In-Reply-To: <87hbfjr2sr.fsf@steelpick.2x.cz>\r
+References: <87hbfjr2sr.fsf@steelpick.2x.cz>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 14 Nov 2010 21:54:53 -0000\r
+\r
+The newline was removed from say_color in commit 222926ab to allow\r
+printing test status in the beginning of the line. Error messages are\r
+never followed by other text so we add the newline to error function.\r
+---\r
+ test/test-lib.sh |    2 +-\r
+ 1 files changed, 1 insertions(+), 1 deletions(-)\r
+\r
+diff --git a/test/test-lib.sh b/test/test-lib.sh\r
+index 68c9cf8..dce9077 100644\r
+--- a/test/test-lib.sh\r
++++ b/test/test-lib.sh\r
+@@ -144,7 +144,7 @@ else\r
+ fi\r
+ \r
+ error () {\r
+-      say_color error "error: $*"\r
++      say_color error "error: $*\n"\r
+       GIT_EXIT_OK=t\r
+       exit 1\r
+ }\r
+-- \r
+1.7.2.3\r
+\r