diff options
| author |  Dmitry Vyukov <dvyukov@google.com> | 2020-07-02 00:04:40 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2020-07-01 15:04:40 -0700 |
| commit | fa5b4dbd9aeca77a90aaa11417ef8153ac9e49d9 (patch) | |
| tree | 579977b859ab08d80ec01b5a03735fa0dc4d9292 /projects/syzkaller | |
| parent | df0ea93918a74d50981f857f645884118ced45d3 (diff) | |
[syzkaller] update go get invocation and fix the build (#3754)
* syzkaller: update go get invocation
The way to checkout the repo has changed.
Fixes: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=21994
* [syzkalle] Fix paths passed to `compile_fuzzer` function.
Co-authored-by: Max Moroz <mmoroz@chromium.org>
Diffstat (limited to 'projects/syzkaller')
| -rw-r--r-- | projects/syzkaller/Dockerfile | 6 | ||||
| -rwxr-xr-x | projects/syzkaller/build.sh | 11 |
2 files changed, 9 insertions, 8 deletions
diff --git a/projects/syzkaller/Dockerfile b/projects/syzkaller/Dockerfile index 983c8fac..efe6c595 100644 --- a/projects/syzkaller/Dockerfile +++ b/projects/syzkaller/Dockerfile @@ -17,11 +17,11 @@ FROM gcr.io/oss-fuzz-base/base-builder MAINTAINER mmoroz@chromium.org -RUN go get -u -d github.com/google/syzkaller/... +RUN go get -u -d github.com/google/syzkaller/prog # Dependency for one of the fuzz targets. +# Note: this should not be necessary because this package is in syzkaller/vendor. RUN go get github.com/ianlancetaylor/demangle -RUN git clone --depth 1 https://github.com/google/syzkaller.git -WORKDIR syzkaller +WORKDIR /root/go/src/github.com/google/syzkaller COPY build.sh $SRC/ diff --git a/projects/syzkaller/build.sh b/projects/syzkaller/build.sh index 744ae34a..cf1fdc26 100755 --- a/projects/syzkaller/build.sh +++ b/projects/syzkaller/build.sh @@ -1,4 +1,4 @@ -#!/bin/bash -eu +#!/bin/bash -eux # Copyright 2019 Google Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -27,10 +27,11 @@ function compile_fuzzer { $CXX $CXXFLAGS $LIB_FUZZING_ENGINE $fuzzer.a -o $OUT/$fuzzer } -compile_fuzzer ./pkg/compiler Fuzz compiler_fuzzer -compile_fuzzer ./prog/test FuzzDeserialize prog_deserialize_fuzzer -compile_fuzzer ./prog/test FuzzParseLog prog_parselog_fuzzer -compile_fuzzer ./pkg/report Fuzz report_fuzzer +make descriptions +compile_fuzzer github.com/google/syzkaller/pkg/compiler Fuzz compiler_fuzzer +compile_fuzzer github.com/google/syzkaller/prog/test FuzzDeserialize prog_deserialize_fuzzer +compile_fuzzer github.com/google/syzkaller/prog/test FuzzParseLog prog_parselog_fuzzer +compile_fuzzer github.com/google/syzkaller/pkg/report Fuzz report_fuzzer # This target is way too spammy and OOMs very quickly. # compile_fuzzer ./tools/syz-trace2syz/proggen Fuzz trace2syz_fuzzer |