wildmatch test: use a paranoia pattern from nul_match()

Use a pattern from the nul_match() function in t7008-grep-binary.sh to
make sure that we don't just fall through to the "else" if there's an
unknown parameter.

This is something I added in commit 77f6f4406f ("grep: add a test
helper function for less verbose -f \0 tests", 2017-05-20) to grep
tests, which were modeled on these wildmatch tests, and I'm now
porting back to the original wildmatch tests.

I am not using the "say '...'; exit 1" pattern from t0000-basic.sh
because if I fail I want to run the rest of the tests (unless under
-i), and doing this makes sure we do that and don't exit right away
without fully reporting our errors.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t3070-wildmatch.sh b/t/t3070-wildmatch.sh
index 19ea64bba90c17358536b9b563c18276f2646e86..9691d8eda342844b75d61babea4f9ece96388d26 100755 (executable)
--- a/t/t3070-wildmatch.sh
+++ b/t/t3070-wildmatch.sh
@@ -10,10 +10,13 @@ match() {
                test_expect_success "wildmatch: match '$3' '$4'" "
                        test-wildmatch wildmatch '$3' '$4'
                "
-       else
+       elif test "$1" = 0
+       then
                test_expect_success "wildmatch: no match '$3' '$4'" "
                        ! test-wildmatch wildmatch '$3' '$4'
                "
+       else
+               test_expect_success "PANIC: Test framework error. Unknown matches value $1" 'false'
        fi
 }
 
@@ -23,10 +26,13 @@ imatch() {
                test_expect_success "iwildmatch: match '$2' '$3'" "
                        test-wildmatch iwildmatch '$2' '$3'
                "
-       else
+       elif test "$1" = 0
+       then
                test_expect_success "iwildmatch: no match '$2' '$3'" "
                        ! test-wildmatch iwildmatch '$2' '$3'
                "
+       else
+               test_expect_success "PANIC: Test framework error. Unknown matches value $1" 'false'
        fi
 }
 
@@ -36,10 +42,13 @@ pathmatch() {
                test_expect_success "pathmatch: match '$2' '$3'" "
                        test-wildmatch pathmatch '$2' '$3'
                "
-       else
+       elif test "$1" = 0
+       then
                test_expect_success "pathmatch: no match '$2' '$3'" "
                        ! test-wildmatch pathmatch '$2' '$3'
                "
+       else
+               test_expect_success "PANIC: Test framework error. Unknown matches value $1" 'false'
        fi
 }