[PATCH 05/10] Make test/basic more portable

diff --git a/1a/24484647887599ffcfc1c40c06a6f2b7af026c b/1a/24484647887599ffcfc1c40c06a6f2b7af026c
new file mode 100644 (file)
index 0000000..a7e638e
--- /dev/null
+++ b/1a/24484647887599ffcfc1c40c06a6f2b7af026c
@@ -0,0 +1,88 @@
+Return-Path: <pioto@pioto.org>\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 0E3D2431FBC\r
+       for <notmuch@notmuchmail.org>; Fri, 25 May 2012 06:44:06 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 wfUhELKI36kz for <notmuch@notmuchmail.org>;\r
+       Fri, 25 May 2012 06:44:04 -0700 (PDT)\r
+Received: from mail-vb0-f53.google.com (mail-vb0-f53.google.com\r
+       [209.85.212.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 58573431FD6\r
+       for <notmuch@notmuchmail.org>; Fri, 25 May 2012 06:44:00 -0700 (PDT)\r
+Received: by mail-vb0-f53.google.com with SMTP id fc26so989685vbb.26\r
+       for <notmuch@notmuchmail.org>; Fri, 25 May 2012 06:44:00 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=google.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references\r
+       :x-gm-message-state;\r
+       bh=YuXwrZFyOe/aYoDIJzpailKDFj9cX5xg3BhgRtc1URc=;\r
+       b=d206amT79ok44/OcoXLV5nF9E0grONhDB1paxE0OhjGmPBwJRP9qqYtCQoXagBm6DY\r
+       6a2+ZYLGkQV2J4wEu4xhcQJcn9g6f5Bhj6ysXk4KgoAakxlp3F9Ok2XeR4kJ0yNHBGlL\r
+       a9cAu8cNsE1VjYsjLbZ8c+BM4P4xMbhZ2EZ41IqSxk6lwzcgvxc4w/05nRF0J/jBbuVL\r
+       utOKe++B/umVMaPQJYesBtSWRpe2lCB/XGGvt83xmLLyYo5X6TQtJemuAYKz6flQetAd\r
+       AuJnvsROdsVMyPXQ216v7PF0Df4RnunqYTSSbQLgmSybGmI681Gw47YCfr2GnQOwYfkq\r
+       LbHg==\r
+Received: by 10.52.23.81 with SMTP id k17mr3075664vdf.103.1337953440155;\r
+       Fri, 25 May 2012 06:44:00 -0700 (PDT)\r
+Received: from nas.home.pioto.org (pool-71-182-155-97.pitbpa.fios.verizon.net.\r
+       [71.182.155.97])\r
+       by mx.google.com with ESMTPS id by3sm4230652vdc.17.2012.05.25.06.43.59\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Fri, 25 May 2012 06:43:59 -0700 (PDT)\r
+Received: by nas.home.pioto.org (Postfix, from userid 1001)\r
+       id 149CD287C9; Fri, 25 May 2012 09:43:59 -0400 (EDT)\r
+From: Mike Kelly <pioto@pioto.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 05/10] Make test/basic more portable\r
+Date: Fri, 25 May 2012 09:43:26 -0400\r
+Message-Id: <1337953411-21000-6-git-send-email-pioto@pioto.org>\r
+X-Mailer: git-send-email 1.7.10.2\r
+In-Reply-To: <1337953411-21000-1-git-send-email-pioto@pioto.org>\r
+References: <1337953411-21000-1-git-send-email-pioto@pioto.org>\r
+X-Gm-Message-State:\r
+ ALoCoQnSBJcUX0eGqF6Y6wxBXwxh5i+qBs8ICjlk6dA77nzZGtK3Z/l08ur3KX8oDVlb2kW6nvSc\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: Fri, 25 May 2012 13:44:06 -0000\r
+\r
+---\r
+ test/basic |    3 ++-\r
+ 1 file changed, 2 insertions(+), 1 deletion(-)\r
+\r
+diff --git a/test/basic b/test/basic\r
+index d6aed24..4ce8967 100755\r
+--- a/test/basic\r
++++ b/test/basic\r
+@@ -53,7 +53,8 @@ test_expect_code 2 'failure to clean up causes the test to fail' '\r
+ test_begin_subtest 'Ensure that all available tests will be run by notmuch-test'\r
+ eval $(sed -n -e '/^TESTS="$/,/^"$/p' $TEST_DIRECTORY/notmuch-test)\r
+ tests_in_suite=$(for i in $TESTS; do echo $i; done | sort)\r
+-available=$(find "$TEST_DIRECTORY" -maxdepth 1 -type f -executable -printf '%f\n' | \\r
++available=$(find "$TEST_DIRECTORY" -maxdepth 1 -type f -perm +111 | \\r
++    sed -e "s,.*/,," | \\r
+     sed -r -e "/^(aggregate-results.sh|notmuch-test|smtp-dummy|test-verbose|symbol-test|arg-test)$/d" | \\r
+     sort)\r
+ test_expect_equal "$tests_in_suite" "$available"\r
+-- \r
+1.7.10.2\r
+\r