[PATCH 1/1] test: unset 'xpg_echo' bash shell option

diff --git a/f4/6d41d3db0a31ad4b7abb489131a8ebd998a184 b/f4/6d41d3db0a31ad4b7abb489131a8ebd998a184
new file mode 100644 (file)
index 0000000..7344cfe
--- /dev/null
+++ b/f4/6d41d3db0a31ad4b7abb489131a8ebd998a184
@@ -0,0 +1,71 @@
+Return-Path: <too@guru-group.fi>\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 207D5431E62\r
+       for <notmuch@notmuchmail.org>; Tue, 20 Aug 2013 09:16:54 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\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 P+x7spOiOjvY for <notmuch@notmuchmail.org>;\r
+       Tue, 20 Aug 2013 09:16:49 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 9701D431FB6\r
+       for <notmuch@notmuchmail.org>; Tue, 20 Aug 2013 09:16:49 -0700 (PDT)\r
+Received: by guru.guru-group.fi (Postfix, from userid 501)\r
+       id 465F210009D; Tue, 20 Aug 2013 19:16:45 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/1] test: unset 'xpg_echo' bash shell option\r
+Date: Tue, 20 Aug 2013 19:16:43 +0300\r
+Message-Id: <1377015403-12457-1-git-send-email-tomi.ollila@iki.fi>\r
+X-Mailer: git-send-email 1.8.0\r
+Cc: tomi.ollila@iki.fi\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: Tue, 20 Aug 2013 16:16:54 -0000\r
+\r
+When 'xpg_echo' bash shell option is unset (usually the default)\r
+echo builtin does not expand backslash-escape sequences by default\r
+(i.e. '\n' is echoed as '\n' instead of newline). Not all bash\r
+installations have this feature we depend on activated by default.\r
+\r
+Note that the feature is bash (and GNU /bin/echo) specific. It is used\r
+as it is convenient. If portability is needed (elsewhere) use printf(1)\r
+(also often available as a shell builtin).\r
+---\r
+ test/test-lib.sh | 3 +++\r
+ 1 file changed, 3 insertions(+)\r
+\r
+diff --git a/test/test-lib.sh b/test/test-lib.sh\r
+index ffab1bb..d3a8c58 100644\r
+--- a/test/test-lib.sh\r
++++ b/test/test-lib.sh\r
+@@ -22,6 +22,9 @@ if [ ${BASH_VERSINFO[0]} -lt 4 ]; then\r
+     exit 1\r
+ fi\r
+ \r
++# Make sure echo builtin does not expand backslash-escape sequences by default.\r
++shopt -u xpg_echo\r
++\r
+ # if --tee was passed, write the output not only to the terminal, but\r
+ # additionally to the file test-results/$BASENAME.out, too.\r
+ case "$GIT_TEST_TEE_STARTED, $* " in\r
+-- \r
+1.8.0\r
+\r