Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-02-06 03:40:46 +0300
committerJunio C Hamano <gitster@pobox.com>2021-02-06 03:40:46 +0300
commit4513f6bbb1e0a49ffe61c2d182317456618b13b9 (patch)
tree2be24201c2c7776e161258aa7c3da27b34e3344f /t
parentdfc3c2b22472b051feac9e6b0d141ce60b76fbdb (diff)
parent134768cf53f433867164cc7a5bc329b332362dd9 (diff)
Merge branch 'sg/test-stress-jobs'
Test framework fix. * sg/test-stress-jobs: test-lib: prevent '--stress-jobs=X' from being ignored
Diffstat (limited to 't')
-rw-r--r--t/test-lib.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 03c1c0836f..76062db296 100644
--- 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"