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

[notmuch] / test / test-lib.sh

diff --git a/test/test-lib.sh b/test/test-lib.sh
index 78af170fe7396efd34d73a17880fe399feaa9980..9222689d5199bf78774ca8ae80367ded6a87b520 100644 (file)
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -196,7 +196,7 @@ print_test_description ()
 {
        test -z "$test_description_printed" || return 0
        echo
-       echo $this_test_bare: "Testing ${test_description}"
+       echo $this_test: "Testing ${test_description}"
        test_description_printed=1
 }
 if [ -z "$NOTMUCH_TEST_QUIET" ]
@@ -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