[PATCH 2/2] test: redirect gdb output to a file.

diff --git a/21/ffbd45fa1cd7589f2ed3c5b25cae04958799fc b/21/ffbd45fa1cd7589f2ed3c5b25cae04958799fc
new file mode 100644 (file)
index 0000000..adffa50
--- /dev/null
+++ b/21/ffbd45fa1cd7589f2ed3c5b25cae04958799fc
@@ -0,0 +1,70 @@
+Return-Path: <bremner@tesseract.cs.unb.ca>\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 37D59429E25\r
+       for <notmuch@notmuchmail.org>; Tue,  6 May 2014 06:07: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 nbrNF-Nn+bUQ for <notmuch@notmuchmail.org>;\r
+       Tue,  6 May 2014 06:07:48 -0700 (PDT)\r
+Received: from mx.xen14.node3324.gplhost.com (gitolite.debian.net\r
+       [87.98.215.224]) (using TLSv1 with cipher AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id A9A2F431FD6\r
+       for <notmuch@notmuchmail.org>; Tue,  6 May 2014 06:07:48 -0700 (PDT)\r
+Received: from remotemail by mx.xen14.node3324.gplhost.com with local (Exim\r
+       4.72) (envelope-from <bremner@tesseract.cs.unb.ca>)\r
+       id 1Whf5O-0006xj-Li; Tue, 06 May 2014 13:07:06 +0000\r
+Received: (nullmailer pid 29572 invoked by uid 1000); Tue, 06 May 2014\r
+       13:06:29 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/2] test: redirect gdb output to a file.\r
+Date: Tue,  6 May 2014 22:06:28 +0900\r
+Message-Id: <1399381588-26271-3-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.9.2\r
+In-Reply-To: <1399381588-26271-1-git-send-email-david@tethera.net>\r
+References: <1399381588-26271-1-git-send-email-david@tethera.net>\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, 06 May 2014 13:07:54 -0000\r
+\r
+It seems that the normal output redirection in the test suite doesn't\r
+work for gdb, but it's nice to have output in a file for debugging.\r
+---\r
+ test/T380-atomicity.sh | 2 +-\r
+ 1 file changed, 1 insertion(+), 1 deletion(-)\r
+\r
+diff --git a/test/T380-atomicity.sh b/test/T380-atomicity.sh\r
+index 1c786fa..2daef90 100755\r
+--- a/test/T380-atomicity.sh\r
++++ b/test/T380-atomicity.sh\r
+@@ -64,7 +64,7 @@ if test_require_external_prereq gdb; then\r
+     # -tty /dev/null works around a conflict between the 'timeout' wrapper\r
+     # and gdb's attempt to control the TTY.\r
+     export MAIL_DIR\r
+-    gdb -tty /dev/null -batch -x $TEST_DIRECTORY/atomicity.gdb notmuch >/dev/null 2>/dev/null\r
++    gdb -tty /dev/null -batch -x $TEST_DIRECTORY/atomicity.gdb notmuch 1>gdb.out 2>&1\r
+ \r
+     # Get the final, golden output\r
+     notmuch search '*' > expected\r
+-- \r
+1.9.2\r
+\r