From 01ccbbb12deb35a84c94b646131f43709a51bfef Mon Sep 17 00:00:00 2001
From: Muhammad Falak R Wani <falakreyaz@gmail.com>
Date: Sun, 25 Aug 2019 18:32:44 +0530
Subject: [PATCH] fuzz: use gofuzz build tag instead of fuzz (#3185)

* fuzz: use gofuzz build tag instead of fuzz

Since go-fuzz does not support Go modules yet, vendor dependencies.

Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>

* fuzz: avoid vendoring code for go-fuzz

Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
---
 Makefile.fuzz          | 8 ++++----
 plugin/cache/fuzz.go   | 2 +-
 plugin/chaos/fuzz.go   | 2 +-
 plugin/file/fuzz.go    | 2 +-
 plugin/rewrite/fuzz.go | 2 +-
 plugin/whoami/fuzz.go  | 2 +-
 test/fuzz_corefile.go  | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Makefile.fuzz b/Makefile.fuzz
index 89b3c6f02..5f915b712 100644
--- a/Makefile.fuzz
+++ b/Makefile.fuzz
@@ -33,20 +33,20 @@ all: $(PLUGINS) corefile
 .PHONY: $(PLUGINS)
 $(PLUGINS): echo
 ifeq ($(LIBFUZZER), YES)
-	go-fuzz-build -tags fuzz -libfuzzer -o $(@).a ./plugin/$(@)
+	go-fuzz-build -libfuzzer -o $(@).a ./plugin/$(@)
 	clang -fsanitize=fuzzer $(@).a -o $(@)
 else
-	go-fuzz-build -tags fuzz $(REPO)/plugin/$(@)
+	go-fuzz-build $(REPO)/plugin/$(@)
 	go-fuzz -bin=./$(@)-fuzz.zip -workdir=fuzz/$(@)
 endif
 
 .PHONY: corefile
 corefile:
 ifeq ($(LIBFUZZER), YES)
-	go-fuzz-build -tags fuzz -libfuzzer -o $(@).a ./test
+	go-fuzz-build -libfuzzer -o $(@).a ./test
 	clang -fsanitize=fuzzer $(@).a -o $(@)
 else
-	go-fuzz-build -tags fuzz $(REPO)/test
+	go-fuzz-build $(REPO)/test
 	go-fuzz -bin=./test-fuzz.zip -workdir=fuzz/$(@)
 endif
 
diff --git a/plugin/cache/fuzz.go b/plugin/cache/fuzz.go
index 401e9b166..368953bbf 100644
--- a/plugin/cache/fuzz.go
+++ b/plugin/cache/fuzz.go
@@ -1,4 +1,4 @@
-// +build fuzz
+// +build gofuzz
 
 package cache
 
diff --git a/plugin/chaos/fuzz.go b/plugin/chaos/fuzz.go
index f5a79f775..df2e9a0dd 100644
--- a/plugin/chaos/fuzz.go
+++ b/plugin/chaos/fuzz.go
@@ -1,4 +1,4 @@
-// +build fuzz
+// +build gofuzz
 
 package chaos
 
diff --git a/plugin/file/fuzz.go b/plugin/file/fuzz.go
index 535db0e93..de26ccc8a 100644
--- a/plugin/file/fuzz.go
+++ b/plugin/file/fuzz.go
@@ -1,4 +1,4 @@
-// +build fuzz
+// +build gofuzz
 
 package file
 
diff --git a/plugin/rewrite/fuzz.go b/plugin/rewrite/fuzz.go
index 545ef5b93..e096db535 100644
--- a/plugin/rewrite/fuzz.go
+++ b/plugin/rewrite/fuzz.go
@@ -1,4 +1,4 @@
-// +build fuzz
+// +build gofuzz
 
 package rewrite
 
diff --git a/plugin/whoami/fuzz.go b/plugin/whoami/fuzz.go
index 917a9189f..3d790ab63 100644
--- a/plugin/whoami/fuzz.go
+++ b/plugin/whoami/fuzz.go
@@ -1,4 +1,4 @@
-// +build fuzz
+// +build gofuzz
 
 package whoami
 
diff --git a/test/fuzz_corefile.go b/test/fuzz_corefile.go
index 0abb9d6b3..a1a7e6a36 100644
--- a/test/fuzz_corefile.go
+++ b/test/fuzz_corefile.go
@@ -1,4 +1,4 @@
-// +build fuzz
+// +build gofuzz
 
 package test