diff options
| author | fanquake <fanquake@gmail.com> | 2023-07-14 10:54:11 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2023-07-14 10:54:30 +0100 |
| commit | 4a1aae67498ff8e9aa7ce97fef70b973c604f892 (patch) | |
| tree | ca8052ff7f6876c242743612f96832afd092b2bb | |
| parent | ee467b82381db0313121a7a6f15d44f0b30f0cf4 (diff) | |
| parent | fa4ccf15118a5e2dcd2a98283b9e6c7e1955a7f1 (diff) | |
Merge bitcoin/bitcoin#28071: ci: Add missing -O2 to valgrind tasks
fa4ccf15118a5e2dcd2a98283b9e6c7e1955a7f1 ci: Add missing -O2 to valgrind tasks (MarcoFalke)
Pull request description:
Currently the tasks have nothing (`-O0`) set, which makes them slow.
Fix this by falling back to the default (`-O2`).
ACKs for top commit:
recursive-rat4:
utACK fa4ccf15118a5e2dcd2a98283b9e6c7e1955a7f1
dergoegge:
utACK fa4ccf15118a5e2dcd2a98283b9e6c7e1955a7f1
Tree-SHA512: 44d803000d883cfa534f2c76d793d7d7f840e114fc377d20fc36d008b471d69ec9f0170358ed1f3567d49e3ff63682244062c954cd0b963df31ca39c08d2d5b9
| -rwxr-xr-x | ci/test/00_setup_env_native_fuzz_with_valgrind.sh | 2 | ||||
| -rwxr-xr-x | ci/test/00_setup_env_native_valgrind.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ci/test/00_setup_env_native_fuzz_with_valgrind.sh b/ci/test/00_setup_env_native_fuzz_with_valgrind.sh index b2213e2f77..abc3854762 100755 --- a/ci/test/00_setup_env_native_fuzz_with_valgrind.sh +++ b/ci/test/00_setup_env_native_fuzz_with_valgrind.sh @@ -16,5 +16,5 @@ export RUN_FUZZ_TESTS=true export FUZZ_TESTS_CONFIG="--valgrind" export GOAL="install" # Temporarily pin dwarf 4, until using Valgrind 3.20 or later -export BITCOIN_CONFIG="--enable-fuzz --with-sanitizers=fuzzer CC=clang CXX=clang++ CFLAGS='-gdwarf-4' CXXFLAGS='-gdwarf-4'" +export BITCOIN_CONFIG="--enable-fuzz --with-sanitizers=fuzzer CC='clang -gdwarf-4' CXX='clang++ -gdwarf-4'" export CCACHE_SIZE=200M diff --git a/ci/test/00_setup_env_native_valgrind.sh b/ci/test/00_setup_env_native_valgrind.sh index d6dcf73182..fa2ae81fdd 100755 --- a/ci/test/00_setup_env_native_valgrind.sh +++ b/ci/test/00_setup_env_native_valgrind.sh @@ -14,4 +14,4 @@ export NO_DEPENDS=1 export TEST_RUNNER_EXTRA="--exclude feature_init,rpc_bind,feature_bind_extra" # Excluded for now, see https://github.com/bitcoin/bitcoin/issues/17765#issuecomment-602068547 export GOAL="install" # Temporarily pin dwarf 4, until using Valgrind 3.20 or later -export BITCOIN_CONFIG="--enable-zmq --with-incompatible-bdb --with-gui=no CC=clang CXX=clang++ CFLAGS='-gdwarf-4' CXXFLAGS='-gdwarf-4'" # TODO enable GUI +export BITCOIN_CONFIG="--enable-zmq --with-incompatible-bdb --with-gui=no CC='clang -gdwarf-4' CXX='clang++ -gdwarf-4'" # TODO enable GUI |