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
This commit is contained in:
commit
1accb34ce0
@ -106,18 +106,18 @@ init_repos () {
|
|||||||
run_on_sparse () {
|
run_on_sparse () {
|
||||||
(
|
(
|
||||||
cd sparse-checkout &&
|
cd sparse-checkout &&
|
||||||
"$@" >../sparse-checkout-out 2>../sparse-checkout-err
|
GIT_PROGRESS_DELAY=100000 "$@" >../sparse-checkout-out 2>../sparse-checkout-err
|
||||||
) &&
|
) &&
|
||||||
(
|
(
|
||||||
cd sparse-index &&
|
cd sparse-index &&
|
||||||
"$@" >../sparse-index-out 2>../sparse-index-err
|
GIT_PROGRESS_DELAY=100000 "$@" >../sparse-index-out 2>../sparse-index-err
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
run_on_all () {
|
run_on_all () {
|
||||||
(
|
(
|
||||||
cd full-checkout &&
|
cd full-checkout &&
|
||||||
"$@" >../full-checkout-out 2>../full-checkout-err
|
GIT_PROGRESS_DELAY=100000 "$@" >../full-checkout-out 2>../full-checkout-err
|
||||||
) &&
|
) &&
|
||||||
run_on_sparse "$@"
|
run_on_sparse "$@"
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user