From faeabef4f386009847a0f91041d44e6f31eec618 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Fri, 30 Apr 2021 08:49:55 +0200 Subject: [PATCH 1/3] ci: Enable D_GLIBCXX_DEBUG for multiprocess task --- .cirrus.yml | 2 +- ci/test/00_setup_env_native_multiprocess.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index e353101eccf..390192bfc6a 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -161,7 +161,7 @@ task: FILE_ENV: "./ci/test/00_setup_env_native_fuzz.sh" task: - name: '[multiprocess] [focal]' + name: '[multiprocess, DEBUG] [focal]' << : *GLOBAL_TASK_TEMPLATE container: image: ubuntu:focal diff --git a/ci/test/00_setup_env_native_multiprocess.sh b/ci/test/00_setup_env_native_multiprocess.sh index 26a3996ce2b..2fa9c675f5e 100644 --- a/ci/test/00_setup_env_native_multiprocess.sh +++ b/ci/test/00_setup_env_native_multiprocess.sh @@ -9,8 +9,8 @@ export LC_ALL=C.UTF-8 export CONTAINER_NAME=ci_native_multiprocess export DOCKER_NAME_TAG=ubuntu:20.04 export PACKAGES="cmake python3" -export DEP_OPTS="MULTIPROCESS=1" +export DEP_OPTS="DEBUG=1 MULTIPROCESS=1" export GOAL="install" -export BITCOIN_CONFIG="--enable-external-signer" +export BITCOIN_CONFIG="--enable-external-signer --enable-debug" export TEST_RUNNER_ENV="BITCOIND=bitcoin-node" export RUN_SECURITY_TESTS="true" From fad0f21c3caba129106799fe6c14aff323ef99f2 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Sat, 1 May 2021 08:53:49 +0200 Subject: [PATCH 2/3] ci: Use clang in multiprocess task to avoid OOM --- ci/test/00_setup_env_native_multiprocess.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/test/00_setup_env_native_multiprocess.sh b/ci/test/00_setup_env_native_multiprocess.sh index 2fa9c675f5e..b8fa5c8854d 100644 --- a/ci/test/00_setup_env_native_multiprocess.sh +++ b/ci/test/00_setup_env_native_multiprocess.sh @@ -8,9 +8,9 @@ export LC_ALL=C.UTF-8 export CONTAINER_NAME=ci_native_multiprocess export DOCKER_NAME_TAG=ubuntu:20.04 -export PACKAGES="cmake python3" +export PACKAGES="cmake python3 llvm clang" export DEP_OPTS="DEBUG=1 MULTIPROCESS=1" export GOAL="install" -export BITCOIN_CONFIG="--enable-external-signer --enable-debug" +export BITCOIN_CONFIG="--enable-external-signer --enable-debug CC=clang CXX=clang++" # Use clang to avoid OOM export TEST_RUNNER_ENV="BITCOIND=bitcoin-node" export RUN_SECURITY_TESTS="true" From fa44f5119a0b412f0d46cad02f638727d140b451 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Sat, 1 May 2021 11:19:15 +0200 Subject: [PATCH 3/3] ci: Clarify that previous_releases task is using DEBUG --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 390192bfc6a..01e0cebc924 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -112,7 +112,7 @@ task: FILE_ENV: "./ci/test/00_setup_env_i686_centos.sh" task: - name: '[previous releases, uses qt5 dev package and some depends packages] [unsigned char] [bionic]' + name: '[previous releases, uses qt5 dev package and some depends packages, DEBUG] [unsigned char] [bionic]' previous_releases_cache: folder: "releases" << : *GLOBAL_TASK_TEMPLATE