Skip to content

Commit 0ca8b7e

Browse files
committed
Merge bitcoin/bitcoin#21812: ci: Enable D_GLIBCXX_DEBUG for multiprocess task
fa44f51 ci: Clarify that previous_releases task is using DEBUG (MarcoFalke) fad0f21 ci: Use clang in multiprocess task to avoid OOM (MarcoFalke) faeabef ci: Enable D_GLIBCXX_DEBUG for multiprocess task (MarcoFalke) Pull request description: Enable `-D_GLIBCXX_DEBUG` via the depends `DEBUG` flag. Also `--enable-debug` to get debug symbols in traces. ACKs for top commit: hebasto: ACK fa44f51, I have reviewed the code and it looks OK, I agree it can be merged, and CI is green. Tree-SHA512: ab2a216bb44ee462f9dd181ec9025962502bd4201a1118ff52b6a193398e7ea3ca465a45a5eb341e308758fc3ef34ea3521f8a1f85ed64478ef3c1f6c1b8b141
2 parents ab9a566 + fa44f51 commit 0ca8b7e

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.cirrus.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ task:
112112
FILE_ENV: "./ci/test/00_setup_env_i686_centos.sh"
113113

114114
task:
115-
name: '[previous releases, uses qt5 dev package and some depends packages] [unsigned char] [bionic]'
115+
name: '[previous releases, uses qt5 dev package and some depends packages, DEBUG] [unsigned char] [bionic]'
116116
previous_releases_cache:
117117
folder: "releases"
118118
<< : *GLOBAL_TASK_TEMPLATE
@@ -161,7 +161,7 @@ task:
161161
FILE_ENV: "./ci/test/00_setup_env_native_fuzz.sh"
162162

163163
task:
164-
name: '[multiprocess] [focal]'
164+
name: '[multiprocess, DEBUG] [focal]'
165165
<< : *GLOBAL_TASK_TEMPLATE
166166
container:
167167
image: ubuntu:focal

ci/test/00_setup_env_native_multiprocess.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ export LC_ALL=C.UTF-8
88

99
export CONTAINER_NAME=ci_native_multiprocess
1010
export DOCKER_NAME_TAG=ubuntu:20.04
11-
export PACKAGES="cmake python3"
12-
export DEP_OPTS="MULTIPROCESS=1"
11+
export PACKAGES="cmake python3 llvm clang"
12+
export DEP_OPTS="DEBUG=1 MULTIPROCESS=1"
1313
export GOAL="install"
14-
export BITCOIN_CONFIG="--enable-external-signer"
14+
export BITCOIN_CONFIG="--enable-external-signer --enable-debug CC=clang CXX=clang++" # Use clang to avoid OOM
1515
export TEST_RUNNER_ENV="BITCOIND=bitcoin-node"
1616
export RUN_SECURITY_TESTS="true"

0 commit comments

Comments
 (0)