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 <jf.hyqohaczlksw4tx6ae@l2015aftruuq.dns007.net>
Message-ID: <1451991305.14.acc64b88@201601.l2015aftruuq.dns007.net>
Date: Tue, 05 Jan 2016 10:55:05 +0000
Precedence: list

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