Merge branch 'en/ort-perf-batch-9'

[thirdparty/git.git] / t / test-lib.sh

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 431adba0fb3f8eafbf28795c15b8a8c941b51f9e..d3f6af6a65451cdd7868e5dc355b44fed49a0670 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -453,36 +453,6 @@ export GIT_DEFAULT_HASH
 GIT_TRACE_BARE=1
 export GIT_TRACE_BARE
 
-check_var_migration () {
-       # the warnings and hints given from this helper depends
-       # on end-user settings, which will disrupt the self-test
-       # done on the test framework itself.
-       case "$GIT_TEST_FRAMEWORK_SELFTEST" in
-       t)      return ;;
-       esac
-
-       old_name=$1 new_name=$2
-       eval "old_isset=\${${old_name}:+isset}"
-       eval "new_isset=\${${new_name}:+isset}"
-
-       case "$old_isset,$new_isset" in
-       isset,)
-               echo >&2 "warning: $old_name is now $new_name"
-               echo >&2 "hint: set $new_name too during the transition period"
-               eval "$new_name=\$$old_name"
-               ;;
-       isset,isset)
-               # do this later
-               # echo >&2 "warning: $old_name is now $new_name"
-               # echo >&2 "hint: remove $old_name"
-               ;;
-       esac
-}
-
-check_var_migration GIT_FSMONITOR_TEST GIT_TEST_FSMONITOR
-check_var_migration TEST_GIT_INDEX_VERSION GIT_TEST_INDEX_VERSION
-check_var_migration GIT_FORCE_PRELOAD_TEST GIT_TEST_PRELOAD_INDEX
-
 # Use specific version of the index file format
 if test -n "${GIT_TEST_INDEX_VERSION:+isset}"
 then
@@ -1519,11 +1489,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