Sync with Git 2.30.7

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

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 7d6e0f89d13d8dcd360a53e54f841065881fd758..474bf926d2eecfd46a077a06868b31da733ba1e2 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -163,8 +163,8 @@ parse_option () {
                ;;
        --stress-jobs=*)
                stress=t;
-               stress=${opt#--*=}
-               case "$stress" in
+               stress_jobs=${opt#--*=}
+               case "$stress_jobs" in
                *[!0-9]*|0*|"")
                        echo "error: --stress-jobs=<N> requires the number of jobs to run" >&2
                        exit 1
@@ -262,9 +262,9 @@ then
        : # Don't stress test again.
 elif test -n "$stress"
 then
-       if test "$stress" != t
+       if test -n "$stress_jobs"
        then
-               job_count=$stress
+               job_count=$stress_jobs
        elif test -n "$GIT_TEST_STRESS_LOAD"
        then
                job_count="$GIT_TEST_STRESS_LOAD"
@@ -404,15 +404,6 @@ TZ=UTC
 export LANG LC_ALL PAGER TZ
 EDITOR=:
 
-# GIT_TEST_GETTEXT_POISON should not influence git commands executed
-# during initialization of test-lib and the test repo. Back it up,
-# unset and then restore after initialization is finished.
-if test -n "$GIT_TEST_GETTEXT_POISON"
-then
-       GIT_TEST_GETTEXT_POISON_ORIG=$GIT_TEST_GETTEXT_POISON
-       unset GIT_TEST_GETTEXT_POISON
-fi
-
 # A call to "unset" with no arguments causes at least Solaris 10
 # /usr/xpg4/bin/sh and /bin/ksh to bail out.  So keep the unsets
 # deriving from the command substitution clustered with the other
@@ -462,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
@@ -1524,22 +1485,10 @@ esac
 test -z "$NO_PERL" && test_set_prereq PERL
 test -z "$NO_PTHREADS" && test_set_prereq PTHREADS
 test -z "$NO_PYTHON" && test_set_prereq PYTHON
-test -n "$USE_LIBPCRE1$USE_LIBPCRE2" && test_set_prereq PCRE
-test -n "$USE_LIBPCRE1" && test_set_prereq LIBPCRE1
+test -n "$USE_LIBPCRE2" && test_set_prereq PCRE
 test -n "$USE_LIBPCRE2" && test_set_prereq LIBPCRE2
 test -z "$NO_GETTEXT" && test_set_prereq GETTEXT
 
-if test -n "$GIT_TEST_GETTEXT_POISON_ORIG"
-then
-       GIT_TEST_GETTEXT_POISON=$GIT_TEST_GETTEXT_POISON_ORIG
-       export GIT_TEST_GETTEXT_POISON
-       unset GIT_TEST_GETTEXT_POISON_ORIG
-fi
-
-test_lazy_prereq C_LOCALE_OUTPUT '
-       ! test_bool_env GIT_TEST_GETTEXT_POISON false
-'
-
 if test -z "$GIT_TEST_CHECK_CACHE_TREE"
 then
        GIT_TEST_CHECK_CACHE_TREE=true
@@ -1717,7 +1666,8 @@ test_lazy_prereq REBASE_P '
 '
 
 # Ensure that no test accidentally triggers a Git command
-# that runs 'crontab', affecting a user's cron schedule.
-# Tests that verify the cron integration must set this locally
+# that runs the actual maintenance scheduler, affecting a user's
+# system permanently.
+# Tests that verify the scheduler integration must set this locally
 # to avoid errors.
-GIT_TEST_CRONTAB="exit 1"
+GIT_TEST_MAINT_SCHEDULER="none:exit 1"