diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-05-27 06:36:57 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-05-27 06:36:57 +0300 |
commit | 1accb34ce0055b9ab43cdf1a8ef6e22e7ae34ffc (patch) | |
tree | 8db3915c53e2dde415c03c9d58a8c224b09093cc /t | |
parent | 5d5b1473453400224ebb126bf3947e0a3276bdf5 (diff) | |
parent | a96355d84c9fe43db4e62597921667efc32b53f6 (diff) |
Merge branch 'ds/t1092-fix-flake-from-progress'
Workaround flaky tests introduced recently.
* ds/t1092-fix-flake-from-progress:
t1092: revert the "-1" hack for emulating "no progress meter"
t1092: use GIT_PROGRESS_DELAY for consistent results
Diffstat (limited to 't')
-rwxr-xr-x | t/t1092-sparse-checkout-compatibility.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh index 12e6c45302..e9a815ca7a 100755 --- a/t/t1092-sparse-checkout-compatibility.sh +++ b/t/t1092-sparse-checkout-compatibility.sh @@ -106,18 +106,18 @@ init_repos () { run_on_sparse () { ( cd sparse-checkout && - "$@" >../sparse-checkout-out 2>../sparse-checkout-err + GIT_PROGRESS_DELAY=100000 "$@" >../sparse-checkout-out 2>../sparse-checkout-err ) && ( cd sparse-index && - "$@" >../sparse-index-out 2>../sparse-index-err + GIT_PROGRESS_DELAY=100000 "$@" >../sparse-index-out 2>../sparse-index-err ) } run_on_all () { ( cd full-checkout && - "$@" >../full-checkout-out 2>../full-checkout-err + GIT_PROGRESS_DELAY=100000 "$@" >../full-checkout-out 2>../full-checkout-err ) && run_on_sparse "$@" } |