From b28234faf8786bc456e9dd6dfa23bba65770e433 Mon Sep 17 00:00:00 2001
From: Tomi Ollila <tomi.ollila@iki.fi>
Date: Tue, 4 Mar 2014 22:38:21 +0200
Subject: [PATCH] [PATCH v2] test: NOTMUCH_SKIP_TESTS accepts test names with
 or without Tddd- prefix

---
 7d/a1983f52b457169018ffc42b52c182383747b8 | 92 +++++++++++++++++++++++
 1 file changed, 92 insertions(+)
 create mode 100644 7d/a1983f52b457169018ffc42b52c182383747b8

diff --git a/7d/a1983f52b457169018ffc42b52c182383747b8 b/7d/a1983f52b457169018ffc42b52c182383747b8
new file mode 100644
index 000000000..f265416d7
--- /dev/null
+++ b/7d/a1983f52b457169018ffc42b52c182383747b8
@@ -0,0 +1,92 @@
+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 7C8FA431FBD
+	for <notmuch@notmuchmail.org>; Tue,  4 Mar 2014 12:38:38 -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 vt544VqbyNdY for <notmuch@notmuchmail.org>;
+	Tue,  4 Mar 2014 12:38:28 -0800 (PST)
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])
+	by olra.theworths.org (Postfix) with ESMTP id 8B525431FBF
+	for <notmuch@notmuchmail.org>; Tue,  4 Mar 2014 12:38:28 -0800 (PST)
+Received: by guru.guru-group.fi (Postfix, from userid 501)
+	id ABE3510024B; Tue,  4 Mar 2014 22:38:22 +0200 (EET)
+From: Tomi Ollila <tomi.ollila@iki.fi>
+To: notmuch@notmuchmail.org
+Subject: [PATCH v2] test: NOTMUCH_SKIP_TESTS accepts test names with or
+	without Tddd- prefix
+Date: Tue,  4 Mar 2014 22:38:21 +0200
+Message-Id: <1393965501-16626-1-git-send-email-tomi.ollila@iki.fi>
+X-Mailer: git-send-email 1.8.0
+In-Reply-To: <1393957666-9684-1-git-send-email-tomi.ollila@iki.fi>
+References: <1393957666-9684-1-git-send-email-tomi.ollila@iki.fi>
+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 20:38:38 -0000
+
+The test names assigned to NOTMUCH_SKIP_TESTS variable can now be given
+with or without the Tddd- prefix for tester convenience:
+
+The test name without Tddd -prefix stays constant even when test filenames
+are renumbered.
+
+The test name with Tddd -prefix is printed out when tests run.
+---
+
+this obsoletes id:1393957666-9684-1-git-send-email-tomi.ollila@iki.fi
+
+ test/test-lib.sh | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/test/test-lib.sh b/test/test-lib.sh
+index 78af170..306ad01 100644
+--- a/test/test-lib.sh
++++ b/test/test-lib.sh
+@@ -825,6 +825,12 @@ test_skip () {
+ 		case $this_test.$test_count in
+ 		$skp)
+ 			to_skip=t
++			break
++		esac
++		case $this_test_bare.$test_count in
++		$skp)
++			to_skip=t
++			break
+ 		esac
+ 	done
+ 	if test -z "$to_skip" && test -n "$prereq" &&
+@@ -1207,6 +1213,12 @@ do
+ 		case "$this_test" in
+ 		$skp)
+ 			to_skip=t
++			break
++		esac
++		case "$this_test_bare" in
++		$skp)
++			to_skip=t
++			break
+ 		esac
+ 	done
+ 	case "$to_skip" in
+-- 
+1.8.5.3
+
-- 
2.26.2