Merge #168: delete_nonreduced_fuzz_inputs: cmake

c9f9de1 delete_nonreduced_fuzz_inputs: rename to fuzz_corpora (dergoegge)
80434c9 delete_nonreduced_fuzz_inputs: switch to cmake (dergoegge)

Pull request description:

  Builds on #169.

  Switch to CMake build system.

ACKs for top commit:
  maflcko:
    lgtm ACK c9f9de1

Tree-SHA512: 05bcc6b6bbaccc063f49f9a46888134f61e02d32227dd3eec5f88a36450d94a330e4d8f12a5bd97b4e4901d97d43e1051b5d214939e31cd447d02c11b23e789e

Author: fanquake

delete_nonreduced_fuzz_inputs.sh

@@ -9,7 +9,7 @@
 # different architectures or even different OS versions, which come with
 # different library packages, but this is left as a future improvement.
 
-export FUZZ_INPUTS_DIR="fuzz_seed_corpus"
+export FUZZ_CORPORA_DIR="fuzz_corpora"
 
 set -e
 
@@ -18,7 +18,7 @@ export DEBIAN_FRONTEND=noninteractive
 apt update
 apt install -y \
   git \
-  build-essential libtool autotools-dev automake pkg-config bsdmainutils python3 \
+  build-essential pkg-config bsdmainutils python3 cmake \
   libsqlite3-dev libevent-dev libboost-dev \
   lsb-release wget software-properties-common gnupg
 
@@ -33,7 +33,7 @@ make -C AFLplusplus LLVM_CONFIG=llvm-config-$LLVM_VERSION PERFORMANCE=1 install
 git clone --depth=1 https://github.com/bitcoin-core/qa-assets.git
 (
   cd qa-assets
-  mv ./"${FUZZ_INPUTS_DIR}" ../all_inputs
+  mv ./"${FUZZ_CORPORA_DIR}" ../all_inputs
   git config user.name "delete_nonreduced_inputs script"
   git config user.email "[email protected]"
   git commit -a -m "Delete fuzz inputs"
@@ -43,44 +43,47 @@ git clone --depth=1 https://github.com/bitcoin/bitcoin.git
 (
   cd bitcoin
 
-  ./autogen.sh
-
   echo "Adding reduced seeds with afl-cmin"
 
-  ./configure LDFLAGS="-fuse-ld=lld" CC=afl-clang-fast CXX=afl-clang-fast++ --enable-fuzz
-  make clean
-  make -j $(nproc)
+  rm -rf build_fuzz/
+  export LDFLAGS="-fuse-ld=lld"
+  cmake -B build_fuzz \
+    -DCMAKE_C_COMPILER=afl-clang-fast -DCMAKE_CXX_COMPILER=afl-clang-fast++ \
+    -DBUILD_FOR_FUZZING=ON
+  cmake --build build_fuzz -j$(nproc)
 
-  WRITE_ALL_FUZZ_TARGETS_AND_ABORT="/tmp/a" "./src/test/fuzz/fuzz" || true
+  WRITE_ALL_FUZZ_TARGETS_AND_ABORT="/tmp/a" "./build_fuzz/src/test/fuzz/fuzz" || true
   readarray FUZZ_TARGETS < "/tmp/a"
   for fuzz_target in ${FUZZ_TARGETS[@]}; do
     if [ -d "../all_inputs/$fuzz_target" ]; then
-      mkdir --parents ../qa-assets/"${FUZZ_INPUTS_DIR}"/$fuzz_target
+      mkdir --parents ../qa-assets/"${FUZZ_CORPORA_DIR}"/$fuzz_target
       # Allow timeouts and crashes with "-A", "-T all" to use all available cores
-      FUZZ=$fuzz_target afl-cmin -T all -A -i ../all_inputs/$fuzz_target -o ../qa-assets/"${FUZZ_INPUTS_DIR}"/$fuzz_target -- ./src/test/fuzz/fuzz
+      FUZZ=$fuzz_target afl-cmin -T all -A -i ../all_inputs/$fuzz_target -o ../qa-assets/"${FUZZ_CORPORA_DIR}"/$fuzz_target -- ./build_fuzz/src/test/fuzz/fuzz
     else
       echo "No input corpus for $fuzz_target (ignoring)"
     fi
   done
 
   (
     cd ../qa-assets
-    git add "${FUZZ_INPUTS_DIR}"
+    git add "${FUZZ_CORPORA_DIR}"
     git commit -m "Reduced inputs for afl-cmin"
   )
 
   for sanitizer in {"fuzzer","fuzzer,address,undefined,integer"}; do
     echo "Adding reduced seeds for sanitizer=${sanitizer}"
 
-    ./configure LDFLAGS="-fuse-ld=lld" CC=clang-$LLVM_VERSION CXX=clang++-$LLVM_VERSION --enable-fuzz --with-sanitizers="${sanitizer}"
-    make clean
-    make -j $(nproc)
+    rm -rf build_fuzz/
+    cmake -B build_fuzz \
+      -DCMAKE_C_COMPILER=clang-$LLVM_VERSION -DCMAKE_CXX_COMPILER=clang++-$LLVM_VERSION \
+      -DBUILD_FOR_FUZZING=ON -DSANITIZERS="$sanitizer"
+    cmake --build build_fuzz -j$(nproc)
 
-    ./test/fuzz/test_runner.py -l DEBUG --par=$(nproc) --m_dir=../all_inputs ../qa-assets/"${FUZZ_INPUTS_DIR}"
+    ( cd build_fuzz; ./test/fuzz/test_runner.py -l DEBUG --par=$(nproc) --m_dir=../../all_inputs ../../qa-assets/"${FUZZ_CORPORA_DIR}" )
 
     (
       cd ../qa-assets
-      git add "${FUZZ_INPUTS_DIR}"
+      git add "${FUZZ_CORPORA_DIR}"
       git commit -m "Reduced inputs for ${sanitizer}"
     )
   done