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

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

[Tomi Ollila]

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

[PATCH v2] test: NOTMUCH_SKIP_TESTS accepts test names with or without Tddd- prefix

[Tomi Ollila]

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

Re: [PATCH v2] test: NOTMUCH_SKIP_TESTS accepts test names with or without Tddd- prefix

[David Bremner]

Tomi Ollila <tomi.ollila@iki.fi> writes:

> The test names assigned to NOTMUCH_SKIP_TESTS variable can now be given
> with or without the Tddd- prefix for tester convenience:

seems to work.

d

Re: [PATCH v2] test: NOTMUCH_SKIP_TESTS accepts test names with or without Tddd- prefix

[David Bremner]

Tomi Ollila <tomi.ollila@iki.fi> writes:

> The test names assigned to NOTMUCH_SKIP_TESTS variable can now be given
> with or without the Tddd- prefix for tester convenience:
>

pushed.

d