Skip to content

Commit 904631e

Browse files
committed
Merge bitcoin/bitcoin#27667: ci: Remove unused errtrace trap ERR
fad09b7 ci: Remove unused errtrace trap ERR (MarcoFalke) Pull request description: This was added in commit 069752b, presumably at a time when the functional tests wouldn't capture stderr. Now that all tests capture and print stderr on failure, it can be removed. Reference: * Unit tests capture via `2>&1`: https://github.com/bitcoin/bitcoin/blob/d7700d3a26478d9b1648463c188648c7047b1c60/src/Makefile.test.include#L421 * Functional tests capture as well: https://github.com/bitcoin/bitcoin/blob/d7700d3a26478d9b1648463c188648c7047b1c60/test/functional/test_framework/test_node.py#L356 ACKs for top commit: fanquake: ACK fad09b7 hebasto: ACK fad09b7, tested on Ubuntu 22.04: I can still see warnings from the sanitizers in both unit and functional tests. Tree-SHA512: 1e786eee432a7a50eb9f78b06b2b157321cc16f91b613e3b476e9e51572592fe4bcf4dc15df176e5f019f24497ac68cf332d2037b55b57498c93f4e19613163c
2 parents 03a4e8d + fad09b7 commit 904631e

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

ci/test/06_script_b.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,6 @@ cd "${BASE_BUILD_DIR}/bitcoin-$HOST"
104104

105105
bash -c "./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG" || ( (cat config.log) && false)
106106

107-
set -o errtrace
108-
trap 'bash -c "cat ${BASE_SCRATCH_DIR}/sanitizer-output/* 2> /dev/null"' ERR
109-
110107
if [[ ${USE_MEMORY_SANITIZER} == "true" ]]; then
111108
# MemorySanitizer (MSAN) does not support tracking memory initialization done by
112109
# using the Linux getrandom syscall. Avoid using getrandom by undefining

0 commit comments

Comments
 (0)