From: Tomi Ollila <tomi.ollila@iki.fi>
Date: Tue, 4 Mar 2014 20:38:21 +0000 (+0200)
Subject: test: NOTMUCH_SKIP_TESTS accepts test names with or without Tddd- prefix
X-Git-Tag: 0.18_rc0~114
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d8ba7bee7d3dd3b7b47c7bfd96434effef7227f0;p=notmuch.git

test: NOTMUCH_SKIP_TESTS accepts test names with or without Tddd- prefix

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.
---

diff --git a/test/test-lib.sh b/test/test-lib.sh
index 9dad1265..9222689d 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