Skip to content

Commit c358d84

Browse files
merge-scriptknst
authored andcommitted
Merge bitcoin#23014: ci: Bump distro version, disable feature_bind_extra for two configurations
fa660de ci: Update valgrind config (MarcoFalke) fad5dbc ci: Update s390x config (MarcoFalke) Pull request description: (See commit messages) ACKs for top commit: fanquake: ACK fa660de Tree-SHA512: b5bf7c89042d5d8f49a92c59b934185447ae42bd055ccb1c6edb98fe104a35eb2d6c26d810bec9f52d545d09599f3d33fc8606fbfb793862610d276b2a4bac6c
1 parent df518cf commit c358d84

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

ci/test/00_setup_env_native_valgrind.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ export LC_ALL=C.UTF-8
99
export PACKAGES="valgrind clang llvm python3-zmq libevent-dev bsdmainutils libboost-dev libdb5.3++-dev libminiupnpc-dev libzmq3-dev"
1010
export USE_VALGRIND=1
1111
export NO_DEPENDS=1
12-
export TEST_RUNNER_EXTRA="--exclude rpc_bind --timeout-factor=4" # Excluded for now, see https://github.com/bitcoin/bitcoin/issues/17765#issuecomment-602068547
12+
export TEST_RUNNER_EXTRA="--exclude rpc_bind,feature_bind_extra --timeout-factor=4" # Excluded for now, see https://github.com/bitcoin/bitcoin/issues/17765#issuecomment-602068547
1313
export GOAL="install"
1414
export BITCOIN_CONFIG="--enable-zmq --with-incompatible-bdb --with-gui=no --enable-suppress-external-warnings CC=clang-18 CXX=clang++-18" # TODO enable GUI

ci/test/00_setup_env_s390x.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ fi
1919
# Use debian to avoid 404 apt errors
2020
export CONTAINER_NAME=ci_s390x
2121
export RUN_UNIT_TESTS=true
22+
export TEST_RUNNER_EXTRA="--exclude rpc_bind,feature_bind_extra" # Excluded for now, see https://github.com/bitcoin/bitcoin/issues/17765#issuecomment-602068547
2223
export RUN_FUNCTIONAL_TESTS=true
2324
export GOAL="install"
2425
export BITCOIN_CONFIG="--enable-reduce-exports --disable-gui-tests --with-boost-process" # GUI tests disabled for now, see https://github.com/bitcoin/bitcoin/issues/23730

0 commit comments

Comments
 (0)