diff options
| author | fanquake <fanquake@gmail.com> | 2021-12-18 10:27:41 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-12-18 10:33:24 +0800 |
| commit | 97b2fc03f666ccbadcd3a497303fb6577842d11f (patch) | |
| tree | babd5f61d088bc7bc03cfa235779507ed7c2478d | |
| parent | 14ba286556faad794f288ef38493c540382897cb (diff) | |
| parent | fa6a548f5485ad5be0106e4727812559aefc5a20 (diff) | |
Merge bitcoin/bitcoin#23803: ci: Disable s390x gui tests for now
fa6a548f5485ad5be0106e4727812559aefc5a20 ci: Disable s390x gui tests for now (MarcoFalke)
Pull request description:
ACKs for top commit:
hebasto:
ACK fa6a548f5485ad5be0106e4727812559aefc5a20, tested locally with
Tree-SHA512: 077bcda0b4612dfbf538eb2999ce9f32ec3739c2ed5709f7c4c5d1a39738fbe6e549bd54b237152fd808736c15af1024e67c95dc87b4c3102738543522cb14d7
| -rwxr-xr-x | ci/test/00_setup_env_s390x.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ci/test/00_setup_env_s390x.sh b/ci/test/00_setup_env_s390x.sh index fd253123e6..344aaecfd3 100755 --- a/ci/test/00_setup_env_s390x.sh +++ b/ci/test/00_setup_env_s390x.sh @@ -14,7 +14,7 @@ export PACKAGES="python3-zmq" if [ -n "$QEMU_USER_CMD" ]; then # Likely cross-compiling, so install the needed gcc and qemu-user export DPKG_ADD_ARCH="s390x" - export PACKAGES="$PACKAGES g++-s390x-linux-gnu qemu-user libc6:s390x libstdc++6:s390x libfontconfig1:s390x libxcb1:s390x" + export PACKAGES="$PACKAGES g++-s390x-linux-gnu qemu-user libc6:s390x libstdc++6:s390x" fi # Use debian to avoid 404 apt errors export CONTAINER_NAME=ci_s390x @@ -23,4 +23,4 @@ export TEST_RUNNER_ENV="LC_ALL=C" export TEST_RUNNER_EXTRA="--exclude rpc_bind,feature_bind_extra" # Excluded for now, see https://github.com/bitcoin/bitcoin/issues/17765#issuecomment-602068547 export RUN_FUNCTIONAL_TESTS=true export GOAL="install" -export BITCOIN_CONFIG="--enable-reduce-exports --with-incompatible-bdb" +export BITCOIN_CONFIG="--enable-reduce-exports --disable-gui-tests" # GUI tests disabled for now, see https://github.com/bitcoin/bitcoin/issues/23730 |