Skip to content

Commit 24647a0

Browse files
committed
Merge #17470: ci: Use clang-8 for fuzzing to run on aarch64 ci systems
fa2ec9f fuzz: Bump timeout in test_runner to accomodate for slow arm64 CPUs (MarcoFalke) fa6e01b ci: Use clang-8 for fuzzing to run on aarch64 ci systems (MarcoFalke) Pull request description: Ubuntu bionic clang is clang version 6, which does not come with libfuzzer. So the ci system breaks down when run on aarch64. Fix that by using clang-8 For reference, the previous error on my ci system was: ``` /usr/bin/ld: cannot find /usr/lib/llvm-6.0/lib/clang/6.0.0/lib/linux/libclang_rt.fuzzer-aarch64.a: No such file or directory ACKs for top commit: laanwj: ACK fa2ec9f Tree-SHA512: 4954dbc36c444d1ae145290115eea6291753c9810c92003ab8d75433c3fe3bfee439d3a99dc394418275527157a8b89f04038c8b16e08c69ec9ded50fb869e70
2 parents 0bb37e4 + fa2ec9f commit 24647a0

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

ci/test/00_setup_env_native_fuzz.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@
66

77
export LC_ALL=C.UTF-8
88

9-
export PACKAGES="clang llvm python3 libssl1.0-dev libevent-dev bsdmainutils libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-test-dev libboost-thread-dev"
9+
export PACKAGES="clang-8 llvm-8 python3 libssl1.0-dev libevent-dev bsdmainutils libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-test-dev libboost-thread-dev"
1010
export NO_DEPENDS=1
1111
export RUN_UNIT_TESTS=false
1212
export RUN_FUNCTIONAL_TESTS=false
1313
export RUN_FUZZ_TESTS=true
1414
export GOAL="install"
15-
export BITCOIN_CONFIG="--enable-fuzz --with-sanitizers=fuzzer,address,undefined CC=clang CXX=clang++"
15+
export BITCOIN_CONFIG="--enable-fuzz --with-sanitizers=fuzzer,address,undefined CC=clang-8 CXX=clang++-8"
16+
# Use clang-8, instead of default clang on bionic, which is clang-6 and does not come with libfuzzer on aarch64

test/fuzz/test_runner.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ def main():
7878
os.path.join(config["environment"]["BUILDDIR"], 'src', 'test', 'fuzz', test_list_selection[0]),
7979
'-help=1',
8080
],
81-
timeout=1,
81+
timeout=10,
8282
check=True,
8383
stderr=subprocess.PIPE,
8484
universal_newlines=True,

0 commit comments

Comments
 (0)