Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix go coverage builds #6369

Merged
merged 2 commits into from
Sep 1, 2021
Merged

Fix go coverage builds #6369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71e0fe2
Fix go coverage builds.
inferno-chromium Sep 1, 2021
cb3e7ba
Fix
inferno-chromium Sep 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions infra/base-images/base-builder-go/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,6 @@ ENV GOPATH /root/go
ENV PATH $PATH:/root/.go/bin:$GOPATH/bin

RUN install_go.sh

COPY ossfuzz_coverage_runner.go $GOPATH
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this needs to be after install_go.sh, otherwise install_go fails.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wait. Where is this file located. Is it located in base-builder-go or base-builder-new?


0 ...se-builder-new/ossfuzz_coverage_runner.go → ...ase-builder-go/ossfuzz_coverage_runner.go
View file
Open in desktop
File renamed without changes.
2 changes: 0 additions & 2 deletions infra/base-images/base-builder-new/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,6 @@ RUN cd $SRC && \
tar -xzv --strip-components=1 -f $SRC/oss-fuzz.tar.gz && \
rm -rf examples $SRC/oss-fuzz.tar.gz

COPY ossfuzz_coverage_runner.go $GOPATH

# Do precompiles before copying other scripts for better cache efficiency.
COPY precompile_afl /usr/local/bin/
RUN precompile_afl
Expand Down
2 changes: 1 addition & 1 deletion projects/protoreflect/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
################################################################################

compile_go_fuzzer github.com/jhump/protoreflect/desc/protoparse FuzzProtoParse fuzz_protoparse
#compile_go_fuzzer github.com/jhump/protoreflect/proto_decoder Fuzz fuzz_dynamic
# compile_go_fuzzer github.com/jhump/protoreflect/proto_decoder Fuzz fuzz_dynamic