T070 tests portability

diff --git a/60/92c38448cf0206f3038da3bc1f37087703be3e b/60/92c38448cf0206f3038da3bc1f37087703be3e
new file mode 100644 (file)
index 0000000..74ed13b
--- /dev/null
+++ b/60/92c38448cf0206f3038da3bc1f37087703be3e
@@ -0,0 +1,101 @@
+Return-Path: <jf.hyqohaczlksw4tx6ae@l2015aftruuq.dns007.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 25A166DE1778\r
+ for <notmuch@notmuchmail.org>; Tue,  5 Jan 2016 02:55:12 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.286\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.286 tagged_above=-999 required=5 tests=[AWL=0.089, \r
+ DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+ RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001,\r
+ TVD_FROM_1=0.999] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id qTXGXkn7kX10 for <notmuch@notmuchmail.org>;\r
+ Tue,  5 Jan 2016 02:55:09 -0800 (PST)\r
+Received: from know-smtprelay-omc-2.server.virginmedia.net\r
+ (know-smtprelay-omc-2.server.virginmedia.net [80.0.253.66])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 316856DE1770\r
+ for <notmuch@notmuchmail.org>; Tue,  5 Jan 2016 02:55:09 -0800 (PST)\r
+Received: from dev.koan19.net ([82.1.197.255])\r
+ by know-smtprelay-2-imp with bizsmtp\r
+ id 2Av51s00F5X6CWA01Av6m6; Tue, 05 Jan 2016 10:55:06 +0000\r
+X-Originating-IP: [82.1.197.255]\r
+X-Spam: 0\r
+X-Authority: v=2.1 cv=RLtOZNW+ c=1 sm=1 tr=0 a=D+CNGfzuhY6ArhcYgadsyQ==:117\r
+ a=D+CNGfzuhY6ArhcYgadsyQ==:17 a=jxr8AxaCAAAA:8 a=L9H7d07YOLsA:10\r
+ a=9cW_t1CCXrUA:10 a=s5jvgZ67dGcA:10 a=dmPqMsitAAAA:8 a=hov-Noh0Y1sA:10\r
+ a=kj9zAlcOel0A:10 a=0eZk5v5M3_xY87suvTcA:9 a=CjuIK1q_8ugA:10\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple;\r
+ d=l2015aftruuq.dns007.net; i=@l2015aftruuq.dns007.net; q=dns/txt; s=l201512;\r
+ t=1451991305; h=To :  Subject : MIME-Version : Content-Type : From :\r
+ Message-ID : Date :  X-Originating-IP : Subject : From : Date;\r
+  bh=W5LCuZHshw/upkFZ9DmXHgjrahFyoGpgWbqNkkm9nhE=;\r
+  b=eax8cheNE6CV4RYqKFGPFrIv5lNj9arCIrJ+ubNSsByiD9hgtBGg+0VE9hVkEkV78rDhvD\r
+ s8V42CSaNZLaoJ5W/UuN5r/2I50N4LIDCFzIu7M1kD6lO9dV6UmNAnFpuGtP1253VaC/WCx0\r
+ f/w1TQDdzoyuRKB44ZgnL7zueIxFBlyOQwyjL4JZqBhtCpi+cd/X1YjKlrsN/Bs+V2KnaK6g ==\r
+To: notmuch@notmuchmail.org\r
+Subject: T070 tests portability\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+Content-Disposition: inline\r
+User-Agent: Mutt/1.5.23.1 (2014-03-12)\r
+From: J Farkas <jf.hyqohaczlksw4tx6ae@l2015aftruuq.dns007.net>\r
+Message-ID: <1451991305.14.acc64b88@201601.l2015aftruuq.dns007.net>\r
+Date: Tue, 05 Jan 2016 10:55:05 +0000\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://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: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Tue, 05 Jan 2016 10:55:12 -0000\r
+\r
+I'm in the process of writing insert tests, but it looks like my\r
+environment is somewhat older than what the current tests are running\r
+on.  The following two trivial changes for the original tests make those\r
+pass cleanly:\r
+\r
+The wc I have from GNU textutils 2.0.22 seems to produce extra\r
+whitespace that needs to be cleaned:\r
+\r
+diff --git a/test/T070-insert.sh b/test/T070-insert.sh\r
+index e7ec6a6..5864b9b 100755\r
+--- a/test/T070-insert.sh\r
++++ b/test/T070-insert.sh\r
+@@ -62,3 +62,3 @@ test_begin_subtest "Insert duplicate message"\r
+ notmuch insert +duptag -unread < "$gen_msg_filename"\r
+-output=$(notmuch search --output=files "subject:insert-subject" | wc -l)\r
++output=$(notmuch search --output=files "subject:insert-subject" | echo $(wc -l))\r
+ test_expect_equal "$output" 2\r
+\r
+And without the following cast, gdb 7.4 complains about the return type.\r
+\r
+    index-file-XAPIAN_EXCEPTION.gdb:7: Error in sourced command file:\r
+    Return value type not available for selected stack frame.\r
+    Please use an explicit cast of the value to return.\r
+\r
+diff --git a/test/T070-insert.sh b/test/T070-insert.sh\r
+index e7ec6a6..5864b9b 100755\r
+--- a/test/T070-insert.sh\r
++++ b/test/T070-insert.sh\r
+@@ -196,3 +196,3 @@ break notmuch_database_add_message\r
+ commands\r
+-return NOTMUCH_STATUS_$code\r
++return (int)NOTMUCH_STATUS_$code\r
+ continue\r
+\r
+Does any of the above look reasonable to reduce the false positives?\r
+With the above, the T070 tests all pass on my system.\r
+\r
+Janos\r
+\r