From fa6e01b2f3cd8523a95bd1906ac5e62ee3cbf319 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Wed, 13 Nov 2019 17:47:11 -0500 Subject: [PATCH 1/2] ci: Use clang-8 for fuzzing to run on aarch64 ci systems --- ci/test/00_setup_env_native_fuzz.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ci/test/00_setup_env_native_fuzz.sh b/ci/test/00_setup_env_native_fuzz.sh index 2e9f529216f..ed331e50691 100644 --- a/ci/test/00_setup_env_native_fuzz.sh +++ b/ci/test/00_setup_env_native_fuzz.sh @@ -6,10 +6,11 @@ export LC_ALL=C.UTF-8 -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" +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" export NO_DEPENDS=1 export RUN_UNIT_TESTS=false export RUN_FUNCTIONAL_TESTS=false export RUN_FUZZ_TESTS=true export GOAL="install" -export BITCOIN_CONFIG="--enable-fuzz --with-sanitizers=fuzzer,address,undefined CC=clang CXX=clang++" +export BITCOIN_CONFIG="--enable-fuzz --with-sanitizers=fuzzer,address,undefined CC=clang-8 CXX=clang++-8" +# Use clang-8, instead of default clang on bionic, which is clang-6 and does not come with libfuzzer on aarch64 From fa2ec9f4518c1da3ab3592537c6cd204693a6069 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Thu, 14 Nov 2019 14:01:05 -0500 Subject: [PATCH 2/2] fuzz: Bump timeout in test_runner to accomodate for slow arm64 CPUs --- test/fuzz/test_runner.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/fuzz/test_runner.py b/test/fuzz/test_runner.py index f19cf924d25..fde99fe4965 100755 --- a/test/fuzz/test_runner.py +++ b/test/fuzz/test_runner.py @@ -78,7 +78,7 @@ def main(): os.path.join(config["environment"]["BUILDDIR"], 'src', 'test', 'fuzz', test_list_selection[0]), '-help=1', ], - timeout=1, + timeout=10, check=True, stderr=subprocess.PIPE, universal_newlines=True,