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