From 9627c194f7664ac28e6d66e4967af92f22e30252 Mon Sep 17 00:00:00 2001
From: Tomi Ollila <tomi.ollila@iki.fi>
Date: Tue, 4 Mar 2014 20:27:46 +0200
Subject: [PATCH] [PATCH 1/1] test: use 'bare' test names in NOTMUCH_SKIP_TESTS
 comparisons

---
 5d/d6a0638e24c4462f0da0386fc4e3f7d6ba9f07 | 75 +++++++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 5d/d6a0638e24c4462f0da0386fc4e3f7d6ba9f07

diff --git a/5d/d6a0638e24c4462f0da0386fc4e3f7d6ba9f07 b/5d/d6a0638e24c4462f0da0386fc4e3f7d6ba9f07
new file mode 100644
index 000000000..99ec23204
--- /dev/null
+++ b/5d/d6a0638e24c4462f0da0386fc4e3f7d6ba9f07
@@ -0,0 +1,75 @@
+Return-Path: <too@guru-group.fi>
+X-Original-To: notmuch@notmuchmail.org
+Delivered-To: notmuch@notmuchmail.org
+Received: from localhost (localhost [127.0.0.1])
+	by olra.theworths.org (Postfix) with ESMTP id 17F36431FBF
+	for <notmuch@notmuchmail.org>; Tue,  4 Mar 2014 10:28:03 -0800 (PST)
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
+X-Spam-Flag: NO
+X-Spam-Score: 0
+X-Spam-Level: 
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
+	autolearn=disabled
+Received: from olra.theworths.org ([127.0.0.1])
+	by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
+	with ESMTP id 5sXqMBcHsu9z for <notmuch@notmuchmail.org>;
+	Tue,  4 Mar 2014 10:27:57 -0800 (PST)
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])
+	by olra.theworths.org (Postfix) with ESMTP id 7C266431FBD
+	for <notmuch@notmuchmail.org>; Tue,  4 Mar 2014 10:27:57 -0800 (PST)
+Received: by guru.guru-group.fi (Postfix, from userid 501)
+	id 700D710024B; Tue,  4 Mar 2014 20:27:48 +0200 (EET)
+From: Tomi Ollila <tomi.ollila@iki.fi>
+To: notmuch@notmuchmail.org
+Subject: [PATCH 1/1] test: use 'bare' test names in NOTMUCH_SKIP_TESTS
+	comparisons
+Date: Tue,  4 Mar 2014 20:27:46 +0200
+Message-Id: <1393957666-9684-1-git-send-email-tomi.ollila@iki.fi>
+X-Mailer: git-send-email 1.8.0
+Cc: tomi.ollila@iki.fi
+X-BeenThere: notmuch@notmuchmail.org
+X-Mailman-Version: 2.1.13
+Precedence: list
+List-Id: "Use and development of the notmuch mail system."
+	<notmuch.notmuchmail.org>
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
+	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>
+List-Post: <mailto:notmuch@notmuchmail.org>
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
+	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
+X-List-Received-Date: Tue, 04 Mar 2014 18:28:03 -0000
+
+The 'bare' part of test file name stays constant even when the filename
+prefixes of test scripts are renumbered.
+Also this change makes test skipping behave like documented.
+---
+ test/test-lib.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/test-lib.sh b/test/test-lib.sh
+index a1c0f27..ac6dc77 100644
+--- a/test/test-lib.sh
++++ b/test/test-lib.sh
+@@ -826,7 +826,7 @@ test_skip () {
+ 	to_skip=
+ 	for skp in $NOTMUCH_SKIP_TESTS
+ 	do
+-		case $this_test.$test_count in
++		case $this_test_bare.$test_count in
+ 		$skp)
+ 			to_skip=t
+ 		esac
+@@ -1208,7 +1208,7 @@ do
+ 	to_skip=
+ 	for skp in $NOTMUCH_SKIP_TESTS
+ 	do
+-		case "$this_test" in
++		case "$this_test_bare" in
+ 		$skp)
+ 			to_skip=t
+ 		esac
+-- 
+1.8.0
+
-- 
2.26.2