t4008: abstract away SHA-1-specific constants

diff --git a/t/t7812-grep-icase-non-ascii.sh b/t/t7812-grep-icase-non-ascii.sh
index 04a61cb8e0d750e59414b231281830cf2545c996..0c685d35986eebf4dd72861b650c82fb6b515b51 100755 (executable)
--- a/t/t7812-grep-icase-non-ascii.sh
+++ b/t/t7812-grep-icase-non-ascii.sh
@@ -12,7 +12,7 @@ test_expect_success GETTEXT_LOCALE 'setup' '
 '
 
 test_have_prereq GETTEXT_LOCALE &&
-test-regex "HALLÓ" "Halló" ICASE &&
+test-tool regex "HALLÓ" "Halló" ICASE &&
 test_set_prereq REGEX_LOCALE
 
 test_expect_success REGEX_LOCALE 'grep literal string, no -F' '
@@ -36,29 +36,14 @@ test_expect_success GETTEXT_LOCALE,PCRE 'grep pcre utf-8 string with "+"' '
 '
 
 test_expect_success REGEX_LOCALE 'grep literal string, with -F' '
-       git grep --debug -i -F "TILRAUN: Halló Heimur!"  2>&1 >/dev/null |
-                grep fixed >debug1 &&
-       test_write_lines "fixed TILRAUN: Halló Heimur!" >expect1 &&
-       test_cmp expect1 debug1 &&
-
-       git grep --debug -i -F "TILRAUN: HALLÓ HEIMUR!"  2>&1 >/dev/null |
-                grep fixed >debug2 &&
-       test_write_lines "fixed TILRAUN: HALLÓ HEIMUR!" >expect2 &&
-       test_cmp expect2 debug2
+       git grep -i -F "TILRAUN: Halló Heimur!" &&
+       git grep -i -F "TILRAUN: HALLÓ HEIMUR!"
 '
 
 test_expect_success REGEX_LOCALE 'grep string with regex, with -F' '
-       test_write_lines "^*TILR^AUN:.* \\Halló \$He[]imur!\$" >file &&
-
-       git grep --debug -i -F "^*TILR^AUN:.* \\Halló \$He[]imur!\$" 2>&1 >/dev/null |
-                grep fixed >debug1 &&
-       test_write_lines "fixed \\^*TILR^AUN:\\.\\* \\\\Halló \$He\\[]imur!\\\$" >expect1 &&
-       test_cmp expect1 debug1 &&
-
-       git grep --debug -i -F "^*TILR^AUN:.* \\HALLÓ \$HE[]IMUR!\$"  2>&1 >/dev/null |
-                grep fixed >debug2 &&
-       test_write_lines "fixed \\^*TILR^AUN:\\.\\* \\\\HALLÓ \$HE\\[]IMUR!\\\$" >expect2 &&
-       test_cmp expect2 debug2
+       test_write_lines "TILRAUN: Halló Heimur [abc]!" >file3 &&
+       git add file3 &&
+       git grep -i -F "TILRAUN: Halló Heimur [abc]!" file3
 '
 
 test_expect_success REGEX_LOCALE 'pickaxe -i on non-ascii' '