Skip to content

Commit b15c386

Browse files
committed
Merge bitcoin/bitcoin#32519: ci: Enable feature_init and wallet_reorgsrestore in valgrind task
fa2be60 ci: Enable feature_init and wallet_reorgsrestore in valgrind task (MarcoFalke) Pull request description: The `fork()` isn't needed and in fact makes the forked process not react to signals (like kill or terminate), so just avoid it and run the valgrind process directly in the CI task. Can be tested with something like: `env -i HOME="$HOME" PATH="$PATH" USER="$USER" MAKEJOBS="-j$(nproc)" FILE_ENV="./ci/test/00_setup_env_native_valgrind.sh" ./ci/test_run_all.sh` ACKs for top commit: fanquake: ACK fa2be60 - x86_64, aarch64 Tree-SHA512: 6293447d501191598c08f0cb9fcb4ed91e4cfec11255e702a926346ef8011d6ebc0ca12e9a1c14fa53541318c4e05dee5c96dfe965dcf4cf833c9392158ab883
2 parents 3f83c74 + fa2be60 commit b15c386

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

ci/test/00_setup_env_native_valgrind.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,8 @@ export CONTAINER_NAME=ci_native_valgrind
1111
export PACKAGES="valgrind python3-zmq libevent-dev libboost-dev libzmq3-dev libsqlite3-dev"
1212
export USE_VALGRIND=1
1313
export NO_DEPENDS=1
14-
15-
# feature_init and wallet_reorgsrestore excluded for now, see https://github.com/bitcoin/bitcoin/issues/32493
1614
# bind tests excluded for now, see https://github.com/bitcoin/bitcoin/issues/17765#issuecomment-602068547
17-
export TEST_RUNNER_EXTRA="--exclude feature_init,wallet_reorgsrestore,rpc_bind,feature_bind_extra"
18-
15+
export TEST_RUNNER_EXTRA="--exclude rpc_bind,feature_bind_extra"
1916
export GOAL="install"
2017
# TODO enable GUI
2118
export BITCOIN_CONFIG="\

ci/test/wrap-valgrind.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22
#
3-
# Copyright (c) 2018-2021 The Bitcoin Core developers
3+
# Copyright (c) 2018-present The Bitcoin Core developers
44
# Distributed under the MIT software license, see the accompanying
55
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
66

@@ -12,7 +12,7 @@ for b_name in "${BASE_OUTDIR}/bin"/*; do
1212
echo "Wrap $b ..."
1313
mv "$b" "${b}_orig"
1414
echo '#!/usr/bin/env bash' > "$b"
15-
echo "valgrind --gen-suppressions=all --quiet --error-exitcode=1 --suppressions=${BASE_ROOT_DIR}/contrib/valgrind.supp \"${b}_orig\" \"\$@\"" >> "$b"
15+
echo "exec valgrind --gen-suppressions=all --quiet --error-exitcode=1 --suppressions=${BASE_ROOT_DIR}/contrib/valgrind.supp \"${b}_orig\" \"\$@\"" >> "$b"
1616
chmod +x "$b"
1717
done
1818
done

0 commit comments

Comments
 (0)