Skip to content

Commit 97b2fc0

Browse files
committed
Merge bitcoin/bitcoin#23803: ci: Disable s390x gui tests for now
fa6a548 ci: Disable s390x gui tests for now (MarcoFalke) Pull request description: ACKs for top commit: hebasto: ACK fa6a548, tested locally with Tree-SHA512: 077bcda0b4612dfbf538eb2999ce9f32ec3739c2ed5709f7c4c5d1a39738fbe6e549bd54b237152fd808736c15af1024e67c95dc87b4c3102738543522cb14d7
2 parents 14ba286 + fa6a548 commit 97b2fc0

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

ci/test/00_setup_env_s390x.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export PACKAGES="python3-zmq"
1414
if [ -n "$QEMU_USER_CMD" ]; then
1515
# Likely cross-compiling, so install the needed gcc and qemu-user
1616
export DPKG_ADD_ARCH="s390x"
17-
export PACKAGES="$PACKAGES g++-s390x-linux-gnu qemu-user libc6:s390x libstdc++6:s390x libfontconfig1:s390x libxcb1:s390x"
17+
export PACKAGES="$PACKAGES g++-s390x-linux-gnu qemu-user libc6:s390x libstdc++6:s390x"
1818
fi
1919
# Use debian to avoid 404 apt errors
2020
export CONTAINER_NAME=ci_s390x
@@ -23,4 +23,4 @@ export TEST_RUNNER_ENV="LC_ALL=C"
2323
export TEST_RUNNER_EXTRA="--exclude rpc_bind,feature_bind_extra" # Excluded for now, see https://github.com/bitcoin/bitcoin/issues/17765#issuecomment-602068547
2424
export RUN_FUNCTIONAL_TESTS=true
2525
export GOAL="install"
26-
export BITCOIN_CONFIG="--enable-reduce-exports --with-incompatible-bdb"
26+
export BITCOIN_CONFIG="--enable-reduce-exports --disable-gui-tests" # GUI tests disabled for now, see https://github.com/bitcoin/bitcoin/issues/23730

0 commit comments

Comments
 (0)