[PATCH 1/1] test: use 'bare' test names in NOTMUCH_SKIP_TESTS comparisons

diff --git a/5d/d6a0638e24c4462f0da0386fc4e3f7d6ba9f07 b/5d/d6a0638e24c4462f0da0386fc4e3f7d6ba9f07
new file mode 100644 (file)
index 0000000..99ec232
--- /dev/null
+++ b/5d/d6a0638e24c4462f0da0386fc4e3f7d6ba9f07
@@ -0,0 +1,75 @@
+Return-Path: <too@guru-group.fi>\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 17F36431FBF\r
+       for <notmuch@notmuchmail.org>; Tue,  4 Mar 2014 10:28:03 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       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 5sXqMBcHsu9z for <notmuch@notmuchmail.org>;\r
+       Tue,  4 Mar 2014 10:27:57 -0800 (PST)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 7C266431FBD\r
+       for <notmuch@notmuchmail.org>; Tue,  4 Mar 2014 10:27:57 -0800 (PST)\r
+Received: by guru.guru-group.fi (Postfix, from userid 501)\r
+       id 700D710024B; Tue,  4 Mar 2014 20:27:48 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/1] test: use 'bare' test names in NOTMUCH_SKIP_TESTS\r
+       comparisons\r
+Date: Tue,  4 Mar 2014 20:27:46 +0200\r
+Message-Id: <1393957666-9684-1-git-send-email-tomi.ollila@iki.fi>\r
+X-Mailer: git-send-email 1.8.0\r
+Cc: tomi.ollila@iki.fi\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: Tue, 04 Mar 2014 18:28:03 -0000\r
+\r
+The 'bare' part of test file name stays constant even when the filename\r
+prefixes of test scripts are renumbered.\r
+Also this change makes test skipping behave like documented.\r
+---\r
+ test/test-lib.sh | 4 ++--\r
+ 1 file changed, 2 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/test/test-lib.sh b/test/test-lib.sh\r
+index a1c0f27..ac6dc77 100644\r
+--- a/test/test-lib.sh\r
++++ b/test/test-lib.sh\r
+@@ -826,7 +826,7 @@ test_skip () {\r
+       to_skip=\r
+       for skp in $NOTMUCH_SKIP_TESTS\r
+       do\r
+-              case $this_test.$test_count in\r
++              case $this_test_bare.$test_count in\r
+               $skp)\r
+                       to_skip=t\r
+               esac\r
+@@ -1208,7 +1208,7 @@ do\r
+       to_skip=\r
+       for skp in $NOTMUCH_SKIP_TESTS\r
+       do\r
+-              case "$this_test" in\r
++              case "$this_test_bare" in\r
+               $skp)\r
+                       to_skip=t\r
+               esac\r
+-- \r
+1.8.0\r
+\r