Skip to content

Commit

Permalink
Merge bitcoin#21138: ci: Re-run wine tests once if they fail
Browse files Browse the repository at this point in the history
faa8afe ci: Re-run wine tests once if they fail (MarcoFalke)

Pull request description:

  Works around the intermittent wine issue: bitcoin#21122 (comment)

ACKs for top commit:
  fanquake:
    ACK faa8afe - thanks for following up with this.

Tree-SHA512: cb377a8e62c7fcf38fb5bdd6203af82c6c302c86f7fc219cb756eb7b6d3d4fe4ebf30a36ebba739199ff7814b26256a3701cf38dc5e681b18c2f249cdf6d852e
  • Loading branch information
fanquake authored and knst committed Apr 4, 2024
1 parent e81aec2 commit 6827f1e
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions ci/test/wrap-wine.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,14 @@

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
if (file "$b" | grep "Windows"); then
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
Expand Down

0 comments on commit 6827f1e

Please sign in to comment.