Skip to content

Commit b97e3a7

Browse files
committed
Merge bitcoin#18477: ci: Use Focal for fuzzers
faa9491 ci: Use Focal for fuzzers (MarcoFalke) Pull request description: This gives us access to clang-10, as well as a newer version of valgrind ACKs for top commit: fanquake: ACK faa9491 - [Clang 10](https://packages.ubuntu.com/focal/clang) and [valgrind 3.15](https://packages.ubuntu.com/focal/valgrind). practicalswift: ACK faa9491 -- diff looks correct & contemporary clang is better than vintage clang Tree-SHA512: 0e67232673434c0309db79c1054e3e981115083585945967e346f4d58792635832100f89911428aab928155e44e5f401207a023681ae008fdb5280cf02c4d427
2 parents 67a7246 + faa9491 commit b97e3a7

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -132,12 +132,12 @@ jobs:
132132
FILE_ENV="./ci/test/00_setup_env_native_valgrind.sh"
133133
134134
- stage: test
135-
name: 'x86_64 Linux [GOAL: install] [bionic] [no depends, only system libs, sanitizers: fuzzer,address,undefined]'
135+
name: 'x86_64 Linux [GOAL: install] [focal] [no depends, only system libs, sanitizers: fuzzer,address,undefined]'
136136
env: >-
137137
FILE_ENV="./ci/test/00_setup_env_native_fuzz.sh"
138138
139139
- stage: test
140-
name: 'x86_64 Linux [GOAL: install] [bionic] [no depends, only system libs, fuzzers under valgrind]'
140+
name: 'x86_64 Linux [GOAL: install] [focal] [no depends, only system libs, fuzzers under valgrind]'
141141
env: >-
142142
FILE_ENV="./ci/test/00_setup_env_native_fuzz_with_valgrind.sh"
143143

ci/test/00_setup_env_native_fuzz.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66

77
export LC_ALL=C.UTF-8
88

9+
export DOCKER_NAME_TAG="ubuntu:20.04"
910
export CONTAINER_NAME=ci_native_fuzz
10-
export PACKAGES="clang-8 llvm-8 python3 libevent-dev bsdmainutils libboost-system-dev libboost-filesystem-dev libboost-test-dev libboost-thread-dev"
11+
export PACKAGES="clang llvm python3 libevent-dev bsdmainutils libboost-system-dev libboost-filesystem-dev libboost-test-dev libboost-thread-dev"
1112
export NO_DEPENDS=1
1213
export RUN_UNIT_TESTS=false
1314
export RUN_FUNCTIONAL_TESTS=false
1415
export RUN_FUZZ_TESTS=true
1516
export GOAL="install"
16-
export BITCOIN_CONFIG="--enable-fuzz --with-sanitizers=fuzzer,address,undefined CC=clang-8 CXX=clang++-8"
17-
# Use clang-8, instead of default clang on bionic, which is clang-6 and does not come with libfuzzer on aarch64
17+
export BITCOIN_CONFIG="--enable-fuzz --with-sanitizers=fuzzer,address,undefined CC=clang CXX=clang++"

ci/test/00_setup_env_native_fuzz_with_valgrind.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66

77
export LC_ALL=C.UTF-8
88

9+
export DOCKER_NAME_TAG="ubuntu:20.04"
910
export CONTAINER_NAME=ci_native_fuzz_valgrind
10-
export PACKAGES="clang-8 llvm-8 python3 libevent-dev bsdmainutils libboost-system-dev libboost-filesystem-dev libboost-test-dev libboost-thread-dev valgrind"
11+
export PACKAGES="clang llvm python3 libevent-dev bsdmainutils libboost-system-dev libboost-filesystem-dev libboost-test-dev libboost-thread-dev valgrind"
1112
export NO_DEPENDS=1
1213
export RUN_UNIT_TESTS=false
1314
export RUN_FUNCTIONAL_TESTS=false
1415
export RUN_FUZZ_TESTS=true
1516
export FUZZ_TESTS_CONFIG="--valgrind"
1617
export GOAL="install"
17-
export BITCOIN_CONFIG="--enable-fuzz --with-sanitizers=fuzzer CC=clang-8 CXX=clang++-8"
18-
# Use clang-8, instead of default clang on bionic, which is clang-6 and does not come with libfuzzer on aarch64
18+
export BITCOIN_CONFIG="--enable-fuzz --with-sanitizers=fuzzer CC=clang CXX=clang++"

0 commit comments

Comments
 (0)