Skip to content

Commit 8e02b48

Browse files
committed
Merge bitcoin/bitcoin#31284: ci: Skip broken Wine64 tests by default
fa5e706 ci: Skip broken Wine64 tests by default (MarcoFalke) Pull request description: I don't think the unit tests run in Wine after the Windows cross-compilation have ever shown a true positive since the MSVC task was added. However, they are a source of frequent false-positives. Thus, disable them by default for now. Anyone can still enable them by setting `RUN_UNIT_TESTS=true`. A follow-up could run them on real Windows, see bitcoin/bitcoin#31176. Conceptually there are many other nightly tasks, which rarely find issues and are not run by default, like the valgrind or s390x tasks. So putting the Wine unit tests in the same bucket should be fine. ACKs for top commit: hebasto: ACK fa5e706, to avoid false-positives. willcl-ark: ACK fa5e706 Tree-SHA512: 6bd54470e4d5ce18923c5d724aba0dbf475d053d7097d3f87e822a455cc537b6ce5f0dfcc8ccd0719c12c5d0c8fc7355a6c84185a6c9b5d484d98aee763d0c49
2 parents ebe4cac + fa5e706 commit 8e02b48

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

.cirrus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ task:
131131
FILE_ENV: "./ci/test/00_setup_env_arm.sh"
132132

133133
task:
134-
name: 'Win64, unit tests, no gui tests, no functional tests'
134+
name: 'Win64-cross'
135135
<< : *GLOBAL_TASK_TEMPLATE
136136
persistent_worker:
137137
labels:

ci/test/00_setup_env_win64.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ export CI_IMAGE_NAME_TAG="docker.io/amd64/debian:bookworm" # Check that https:/
1111
export HOST=x86_64-w64-mingw32
1212
export DPKG_ADD_ARCH="i386"
1313
export PACKAGES="nsis g++-mingw-w64-x86-64-posix wine-binfmt wine64 wine32 file"
14+
# Install wine, but do not run unit tests, as they surface frequent
15+
# false-positives.
16+
export RUN_UNIT_TESTS=${RUN_UNIT_TESTS:-false}
1417
export RUN_FUNCTIONAL_TESTS=false
1518
export GOAL="deploy"
1619
# Prior to 11.0.0, the mingw-w64 headers were missing noreturn attributes, causing warnings when

0 commit comments

Comments
 (0)