Skip to content

Commit cda9142

Browse files
committed
Merge #21138: ci: Re-run wine tests once if they fail
faa8afe ci: Re-run wine tests once if they fail (MarcoFalke) Pull request description: Works around the intermittent wine issue: bitcoin/bitcoin#21122 (comment) ACKs for top commit: fanquake: ACK faa8afe - thanks for following up with this. Tree-SHA512: cb377a8e62c7fcf38fb5bdd6203af82c6c302c86f7fc219cb756eb7b6d3d4fe4ebf30a36ebba739199ff7814b26256a3701cf38dc5e681b18c2f249cdf6d852e
2 parents f61c3a1 + faa8afe commit cda9142

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

ci/test/wrap-wine.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,14 @@
66

77
export LC_ALL=C.UTF-8
88

9-
wine --version
10-
119
for b_name in {"${BASE_OUTDIR}/bin"/*,src/secp256k1/*tests,src/univalue/{no_nul,test_json,unitester,object}}.exe; do
1210
# shellcheck disable=SC2044
1311
for b in $(find "${BASE_ROOT_DIR}" -executable -type f -name "$(basename $b_name)"); do
1412
if (file "$b" | grep "Windows"); then
1513
echo "Wrap $b ..."
1614
mv "$b" "${b}_orig"
1715
echo '#!/usr/bin/env bash' > "$b"
18-
echo "wine \"${b}_orig\" \"\$@\"" >> "$b"
16+
echo "( wine \"${b}_orig\" \"\$@\" ) || ( sleep 1 && wine \"${b}_orig\" \"\$@\" )" >> "$b"
1917
chmod +x "$b"
2018
fi
2119
done

0 commit comments

Comments
 (0)