Fix go coverage builds (#6369)

* Fix go coverage builds. * Fix
google · Sep 1, 2021 · df8c808 · df8c808
1 parent 2df776b
commit df8c808
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/infra/base-images/base-builder-go/Dockerfile b/infra/base-images/base-builder-go/Dockerfile
@@ -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
+
diff --git a/...se-builder-new/ossfuzz_coverage_runner.go → ...ase-builder-go/ossfuzz_coverage_runner.go b/...se-builder-new/ossfuzz_coverage_runner.go → ...ase-builder-go/ossfuzz_coverage_runner.go
diff --git a/infra/base-images/base-builder-new/Dockerfile b/infra/base-images/base-builder-new/Dockerfile
@@ -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

diff --git a/projects/protoreflect/build.sh b/projects/protoreflect/build.sh
@@ -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
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