diff options
| author | fanquake <fanquake@gmail.com> | 2021-02-10 19:50:39 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-02-10 19:51:01 +0800 |
| commit | cda914228a56d614ceba090e222d7a7d81970c12 (patch) | |
| tree | 054c7c1094b25a73691c242cf93afe1c3509877e | |
| parent | f61c3a109098d9b162869401f2440806dbbad911 (diff) | |
| parent | faa8afe70b4992267176a97262f59413d1a1196b (diff) | |
Merge #21138: ci: Re-run wine tests once if they fail
faa8afe70b4992267176a97262f59413d1a1196b ci: Re-run wine tests once if they fail (MarcoFalke)
Pull request description:
Works around the intermittent wine issue: https://github.com/bitcoin/bitcoin/issues/21122#issuecomment-776517563
ACKs for top commit:
fanquake:
ACK faa8afe70b4992267176a97262f59413d1a1196b - thanks for following up with this.
Tree-SHA512: cb377a8e62c7fcf38fb5bdd6203af82c6c302c86f7fc219cb756eb7b6d3d4fe4ebf30a36ebba739199ff7814b26256a3701cf38dc5e681b18c2f249cdf6d852e
| -rwxr-xr-x | ci/test/wrap-wine.sh | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ci/test/wrap-wine.sh b/ci/test/wrap-wine.sh index 5c2eae2dd6..82964897e1 100755 --- a/ci/test/wrap-wine.sh +++ b/ci/test/wrap-wine.sh @@ -6,8 +6,6 @@ export LC_ALL=C.UTF-8 -wine --version - for b_name in {"${BASE_OUTDIR}/bin"/*,src/secp256k1/*tests,src/univalue/{no_nul,test_json,unitester,object}}.exe; do # shellcheck disable=SC2044 for b in $(find "${BASE_ROOT_DIR}" -executable -type f -name "$(basename $b_name)"); do @@ -15,7 +13,7 @@ for b_name in {"${BASE_OUTDIR}/bin"/*,src/secp256k1/*tests,src/univalue/{no_nul, echo "Wrap $b ..." mv "$b" "${b}_orig" echo '#!/usr/bin/env bash' > "$b" - echo "wine \"${b}_orig\" \"\$@\"" >> "$b" + echo "( wine \"${b}_orig\" \"\$@\" ) || ( sleep 1 && wine \"${b}_orig\" \"\$@\" )" >> "$b" chmod +x "$b" fi done |