aboutsummaryrefslogtreecommitdiffhomepage
path: root/projects
diff options
context:
space:
mode:
authorGravatar Jamie Wilkinson <jaq@spacepants.org>2020-11-30 13:14:32 +1100
committerGravatar GitHub <noreply@github.com>2020-11-29 18:14:32 -0800
commit061586aea9912c430c2fc120887ac9d0d19c1928 (patch)
tree20c18e46e8caef1966867f677efaa10525a1f7d2 /projects
parent11996eb640155b840f9e94b6537a609cfa65e5ab (diff)
Update mtail fuzzing to use compile_go_fuzzer. (#4744)
Diffstat (limited to 'projects')
-rw-r--r--projects/mtail/Dockerfile5
-rwxr-xr-xprojects/mtail/build.sh12
2 files changed, 5 insertions, 12 deletions
diff --git a/projects/mtail/Dockerfile b/projects/mtail/Dockerfile
index 3f2c070f..7861cbcd 100644
--- a/projects/mtail/Dockerfile
+++ b/projects/mtail/Dockerfile
@@ -15,7 +15,6 @@
################################################################################
FROM gcr.io/oss-fuzz-base/base-builder
-RUN mkdir -p github.com/google
-RUN git clone --depth 1 https://github.com/google/mtail github.com/google/mtail
-WORKDIR github.com/google/mtail
+RUN git clone --depth 1 https://github.com/google/mtail $GOPATH/src/github.com/google/mtail
+WORKDIR $GOPATH/src/github.com/google/mtail
COPY build.sh $SRC/
diff --git a/projects/mtail/build.sh b/projects/mtail/build.sh
index 58c6cf7f..2c769ad3 100755
--- a/projects/mtail/build.sh
+++ b/projects/mtail/build.sh
@@ -15,12 +15,6 @@
#
################################################################################
-# We've used git checkout, not go get to fetch the source so set up the GOPATH to find our source.
-export GOPATH=$GOPATH:/
-
-# go-fuzz-build doesn't like modules until https://github.com/dvyukov/go-fuzz/issues/195 is fixed
-# fetch and vendor all the dependencies so go-fuzz-build can find them
-make GO111MODULE=off --debug install_deps
-go mod vendor
-
-make GO111MODULE=off --debug $OUT/vm-fuzzer.dict $OUT/vm-fuzzer_seed_corpus.zip $OUT/vm-fuzzer
+compile_go_fuzzer github.com/google/mtail/internal/vm Fuzz vm-fuzzer
+# Make the dictionary and seed corpus.
+make --debug $OUT/vm-fuzzer.dict $OUT/vm-fuzzer_seed_corpus.zip