grep: add a test helper function for less verbose -f \0 tests

Add a helper function to make the tests which check for patterns with
\0 in them more succinct. Right now this isn't a big win, but
subsequent commits will add a lot more of these tests.

The helper is based on the match() function in t3070-wildmatch.sh.

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

diff --git a/t/t7008-grep-binary.sh b/t/t7008-grep-binary.sh
index 9c9c378119defa7884a21beb27e806ddf1171497..df93d8e44c5616c2e011001a54cea639fe393f29 100755 (executable)
--- a/t/t7008-grep-binary.sh
+++ b/t/t7008-grep-binary.sh
@@ -4,6 +4,29 @@ test_description='git grep in binary files'
 
 . ./test-lib.sh
 
 
 . ./test-lib.sh
 

+nul_match () {
+       matches=$1
+       flags=$2
+       pattern=$3
+       pattern_human=$(echo "$pattern" | sed 's/Q/<NUL>/g')
+
+       if test "$matches" = 1
+       then
+               test_expect_success "git grep -f f $flags '$pattern_human' a" "
+                       printf '$pattern' | q_to_nul >f &&
+                       git grep -f f $flags a
+               "
+       elif test "$matches" = 0
+       then
+               test_expect_success "git grep -f f $flags '$pattern_human' a" "
+                       printf '$pattern' | q_to_nul >f &&
+                       test_must_fail git grep -f f $flags a
+               "
+       else
+               test_expect_success "PANIC: Test framework error. Unknown matches value $matches" 'false'
+       fi
+}
+

 test_expect_success 'setup' "
        echo 'binaryQfile' | q_to_nul >a &&
        git add a &&
 test_expect_success 'setup' "
        echo 'binaryQfile' | q_to_nul >a &&
        git add a &&


@@ -69,35 +92,12 @@ test_expect_failure 'git grep .fi a' '
        git grep .fi a
 '
 
        git grep .fi a
 '
 

-test_expect_success 'git grep -F y<NUL>f a' "
-       printf 'yQf' | q_to_nul >f &&
-       git grep -f f -F a
-"
-
-test_expect_success 'git grep -F y<NUL>x a' "
-       printf 'yQx' | q_to_nul >f &&
-       test_must_fail git grep -f f -F a
-"
-
-test_expect_success 'git grep -Fi Y<NUL>f a' "
-       printf 'YQf' | q_to_nul >f &&
-       git grep -f f -Fi a
-"
-
-test_expect_success 'git grep -Fi Y<NUL>x a' "
-       printf 'YQx' | q_to_nul >f &&
-       test_must_fail git grep -f f -Fi a
-"
-
-test_expect_success 'git grep y<NUL>f a' "
-       printf 'yQf' | q_to_nul >f &&
-       git grep -f f a
-"
-
-test_expect_success 'git grep y<NUL>x a' "
-       printf 'yQx' | q_to_nul >f &&
-       test_must_fail git grep -f f a
-"
+nul_match 1 '-F' 'yQf'
+nul_match 0 '-F' 'yQx'
+nul_match 1 '-Fi' 'YQf'
+nul_match 0 '-Fi' 'YQx'
+nul_match 1 '' 'yQf'
+nul_match 0 '' 'yQx'

 
 test_expect_success 'grep respects binary diff attribute' '
        echo text >t &&
 
 test_expect_success 'grep respects binary diff attribute' '
        echo text >t &&