diff options
| author | fanquake <fanquake@gmail.com> | 2023-05-16 15:27:53 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2023-05-16 15:28:04 +0100 |
| commit | 904631e0fc00ac9c8a03d1ce226d071bf88c00db (patch) | |
| tree | 94174ff85ce0fa6c0a80636ad93049608bf6d1c6 /ci | |
| parent | 03a4e8dd4c63d94ecf9f9cd92a4ac3c220cf888b (diff) | |
| parent | fad09b703f5c6d8524a09eef771eb4525f9f3225 (diff) | |
| download | bitcoin-904631e0fc00ac9c8a03d1ce226d071bf88c00db.tar.xz | |
Merge bitcoin/bitcoin#27667: ci: Remove unused errtrace trap ERR
fad09b703f5c6d8524a09eef771eb4525f9f3225 ci: Remove unused errtrace trap ERR (MarcoFalke)
Pull request description:
This was added in commit 069752b72613b772a9536a3e7f15fa75097f2946, 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 fad09b703f5c6d8524a09eef771eb4525f9f3225
hebasto:
ACK fad09b703f5c6d8524a09eef771eb4525f9f3225, tested on Ubuntu 22.04: I can still see warnings from the sanitizers in both unit and functional tests.
Tree-SHA512: 1e786eee432a7a50eb9f78b06b2b157321cc16f91b613e3b476e9e51572592fe4bcf4dc15df176e5f019f24497ac68cf332d2037b55b57498c93f4e19613163c
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/test/06_script_b.sh | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/ci/test/06_script_b.sh b/ci/test/06_script_b.sh index e54dc14191..075685ee8d 100755 --- a/ci/test/06_script_b.sh +++ b/ci/test/06_script_b.sh @@ -104,9 +104,6 @@ cd "${BASE_BUILD_DIR}/bitcoin-$HOST" bash -c "./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG" || ( (cat config.log) && false) -set -o errtrace -trap 'bash -c "cat ${BASE_SCRATCH_DIR}/sanitizer-output/* 2> /dev/null"' ERR - if [[ ${USE_MEMORY_SANITIZER} == "true" ]]; then # MemorySanitizer (MSAN) does not support tracking memory initialization done by # using the Linux getrandom syscall. Avoid using getrandom by undefining |