From 038808d7b5342237314adf5017ee70dbb9aed1b8 Mon Sep 17 00:00:00 2001 From: Catena cyber <35799796+catenacyber@users.noreply.github.com> Date: Mon, 1 Mar 2021 16:50:59 +0100 Subject: [PATCH] Fixes radon build (#5267) * Fixes radon build * Fixes lotus build for all fuzz targets * Fixes lotus --- projects/lotus/build.sh | 6 ++++++ projects/radon/Dockerfile | 4 ++-- projects/radon/build.sh | 4 +++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/projects/lotus/build.sh b/projects/lotus/build.sh index 2d4cf9e6c..d0de20761 100644 --- a/projects/lotus/build.sh +++ b/projects/lotus/build.sh @@ -18,6 +18,12 @@ make compile_go_fuzzer github.com/filecoin-project/lotus/chain/types FuzzMessage fuzz_message gofuzz + +cd ../fuzzing-lotus/fuzz +# obsolete modules referenced +rm -Rf libfuzzer +go mod init github.com/filecoin-project/fuzzing-lotus/fuzz + compile_go_fuzzer github.com/filecoin-project/fuzzing-lotus/fuzz FuzzBlockMsg fuzz_block_msg compile_go_fuzzer github.com/filecoin-project/fuzzing-lotus/fuzz FuzzBlockMsgStructural fuzz_block_msg_structural compile_go_fuzzer github.com/filecoin-project/fuzzing-lotus/fuzz FuzzBlockHeader fuzz_block_header diff --git a/projects/radon/Dockerfile b/projects/radon/Dockerfile index 3d7b583b6..fe4c6ca5d 100644 --- a/projects/radon/Dockerfile +++ b/projects/radon/Dockerfile @@ -15,6 +15,6 @@ ################################################################################ FROM gcr.io/oss-fuzz-base/base-builder -RUN go get github.com/radondb/radon/src/fuzz/sqlparser@master +RUN git clone --depth 1 https://github.com/radondb/radon COPY build.sh $SRC/ -WORKDIR $SRC/ +WORKDIR $SRC/radon diff --git a/projects/radon/build.sh b/projects/radon/build.sh index 8bbc04a9c..ffc97895e 100644 --- a/projects/radon/build.sh +++ b/projects/radon/build.sh @@ -16,4 +16,6 @@ ################################################################################ -compile_go_fuzzer github.com/radondb/radon/src/fuzz/sqlparser Fuzz fuzz +cd ./src/fuzz/sqlparser +go mod init github.com/radondb/radon/src/fuzz/sqlparser +compile_go_fuzzer . Fuzz fuzz