diff options
| -rwxr-xr-x | t/t0020-crlf.sh | 6 | ||||
| -rwxr-xr-x | t/t9003-help-autocorrect.sh | 7 | ||||
| -rw-r--r-- | t/test-lib.sh | 5 |
3 files changed, 4 insertions, 14 deletions
diff --git a/t/t0020-crlf.sh b/t/t0020-crlf.sh index 375cf94..f25ae8b 100755 --- a/t/t0020-crlf.sh +++ b/t/t0020-crlf.sh @@ -87,10 +87,8 @@ test_expect_success 'safecrlf: print warning only once' ' git commit -m "nowarn" && for w in Oh here is CRLFQ in text; do echo $w; done | q_to_cr >doublewarn && git add doublewarn 2>err && - if test_have_prereq C_LOCALE_OUTPUT - then - test $(grep "CRLF will be replaced by LF" err | wc -l) = 1 - fi + grep "CRLF will be replaced by LF" err >err.warnings && + test_line_count = 1 err.warnings ' diff --git a/t/t9003-help-autocorrect.sh b/t/t9003-help-autocorrect.sh index 03cd5c5..f00deaf 100755 --- a/t/t9003-help-autocorrect.sh +++ b/t/t9003-help-autocorrect.sh @@ -56,11 +56,8 @@ test_expect_success 'autocorrect can be declined altogether' ' git config help.autocorrect never && test_must_fail git lfg 2>actual && - if test_have_prereq C_LOCALE_OUTPUT - then - grep "is not a git command" actual && - test_line_count = 1 actual - fi + grep "is not a git command" actual && + test_line_count = 1 actual ' test_done diff --git a/t/test-lib.sh b/t/test-lib.sh index 431adba..6d188a8 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -1519,11 +1519,6 @@ test -n "$USE_LIBPCRE2" && test_set_prereq PCRE test -n "$USE_LIBPCRE2" && test_set_prereq LIBPCRE2 test -z "$NO_GETTEXT" && test_set_prereq GETTEXT -# Used to be used for GIT_TEST_GETTEXT_POISON=false. Only here as a -# shim for other in-flight changes. Should not be used and will be -# removed soon. -test_set_prereq C_LOCALE_OUTPUT - if test -z "$GIT_TEST_CHECK_CACHE_TREE" then GIT_TEST_CHECK_CACHE_TREE=true |