Merge branch 'sg/test-stress-jobs'

Test framework fix.

* sg/test-stress-jobs:
  test-lib: prevent '--stress-jobs=X' from being ignored
This commit is contained in:
Junio C Hamano 2021-02-05 16:40:46 -08:00
commit 4513f6bbb1

View file

@ -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"