tests: make GIT_TEST_GETTEXT_POISON a boolean

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 908ddb9c46630d8d9678f610cfde7617bc38514c..ed5d69dfe5144fe7a6c85ad2541ba44b0e530f5c 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -1443,11 +1443,9 @@ then
        unset GIT_TEST_GETTEXT_POISON_ORIG
 fi
 
-# Can we rely on git's output in the C locale?
-if test -z "$GIT_TEST_GETTEXT_POISON"
-then
-       test_set_prereq C_LOCALE_OUTPUT
-fi
+test_lazy_prereq C_LOCALE_OUTPUT '
+       ! git env--helper --type=bool --default=0 --exit-code GIT_TEST_GETTEXT_POISON
+'
 
 if test -z "$GIT_TEST_CHECK_CACHE_TREE"
 then
@@ -1522,7 +1520,7 @@ test_lazy_prereq NOT_ROOT '
 '
 
 test_lazy_prereq JGIT '
-       type jgit
+       jgit --version
 '
 
 # SANITY is about "can you correctly predict what the filesystem would
@@ -1607,3 +1605,7 @@ test_lazy_prereq SHA1 '
 test_lazy_prereq REBASE_P '
        test -z "$GIT_TEST_SKIP_REBASE_P"
 '
+
+test_lazy_prereq FAIL_PREREQS '
+       test -n "$GIT_TEST_FAIL_PREREQS"
+'