[PATCH] test: always report missing prereqs, independent of `--verbose' option

diff --git a/1d/5bf85a2b5df74d822399d6b2090b7b67142fc7 b/1d/5bf85a2b5df74d822399d6b2090b7b67142fc7
new file mode 100644 (file)
index 0000000..b594579
--- /dev/null
+++ b/1d/5bf85a2b5df74d822399d6b2090b7b67142fc7
@@ -0,0 +1,81 @@
+Return-Path: <pieter@praet.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 A433B431FAF\r
+       for <notmuch@notmuchmail.org>; Wed, 18 Jan 2012 04:21:33 -0800 (PST)\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 DrtY3FqEjBTY for <notmuch@notmuchmail.org>;\r
+       Wed, 18 Jan 2012 04:21:33 -0800 (PST)\r
+Received: from mail-ww0-f45.google.com (mail-ww0-f45.google.com\r
+ [74.125.82.45])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ 1D4DC431FAE   for <notmuch@notmuchmail.org>; Wed, 18 Jan 2012 04:21:32 -0800\r
+ (PST)\r
+Received: by wgbdr13 with SMTP id dr13so2254717wgb.2\r
+       for <notmuch@notmuchmail.org>; Wed, 18 Jan 2012 04:21:31 -0800 (PST)\r
+Received: by 10.180.77.35 with SMTP id p3mr36072496wiw.11.1326889291902;\r
+       Wed, 18 Jan 2012 04:21:31 -0800 (PST)\r
+Received: from localhost ([109.131.97.13])\r
+       by mx.google.com with ESMTPS id r1sm22124380wia.8.2012.01.18.04.21.31\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Wed, 18 Jan 2012 04:21:31 -0800 (PST)\r
+From: Pieter Praet <pieter@praet.org>\r
+To: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>,\r
+       Ethan Glasser-Camp <glasse@cs.rpi.edu>\r
+Subject: [PATCH] test: always report missing prereqs,\r
+       independent of `--verbose' option\r
+Date: Wed, 18 Jan 2012 13:19:41 +0100\r
+Message-Id: <1326889181-32311-1-git-send-email-pieter@praet.org>\r
+X-Mailer: git-send-email 1.7.8.1\r
+In-Reply-To: <87d3aj8rcl.fsf@gmail.com>\r
+References: <87d3aj8rcl.fsf@gmail.com>\r
+Cc: Notmuch Mail <notmuch@notmuchmail.org>\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: Wed, 18 Jan 2012 12:21:33 -0000\r
+\r
+When tests are skipped due to missing prereqs, those prereqs are only\r
+displayed when running with the `--verbose' option.  This is essential\r
+information when troubleshooting, so always send to stdout.\r
+\r
+---\r
+\r
+ test/test-lib.sh |    4 ++--\r
+ 1 files changed, 2 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/test/test-lib.sh b/test/test-lib.sh\r
+index d1fbc05..6560628 100644\r
+--- a/test/test-lib.sh\r
++++ b/test/test-lib.sh\r
+@@ -673,8 +673,8 @@ test_skip () {\r
+ \r
+ test_check_missing_external_prereqs_ () {\r
+       if test -n "$test_subtest_missing_external_prereqs_"; then\r
+-              say_color skip >&3 "missing prerequisites:"\r
+-              echo "$test_subtest_missing_external_prereqs_" >&3\r
++              say_color skip >&1 "missing prerequisites:"\r
++              echo "$test_subtest_missing_external_prereqs_" >&1\r
+               test_report_skip_ "$@"\r
+       else\r
+               false\r
+-- \r
+1.7.8.1\r
+\r