Add opt-in go-fuzz modules support

dvyukov · Oct 7, 2019 · 9085030 · 9085030
1 parent 3901820
commit 9085030
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -105,6 +105,7 @@ This will produce png-fuzz.zip archive.
 Note that go-fuzz [does not support modules yet](https://github.com/dvyukov/go-fuzz/issues/195).
 `go-fuzz-build` disables modules by setting environment variable `GO111MODULE=off` during the build.
 
+
 Now we are ready to go:
 ```
 $ go-fuzz

diff --git a/go-fuzz-build/main.go b/go-fuzz-build/main.go
@@ -60,7 +60,13 @@ func makeTags() string {
 // that clients can then modify and use for calls to go/packages.
 func basePackagesConfig() *packages.Config {
 	cfg := new(packages.Config)
-	cfg.Env = append(os.Environ(), "GO111MODULE=off")
+	goFuzzModule, isGoFuzzModuleSet := os.LookupEnv("GOFUZZ111MODULE")
+
+	if isGoFuzzModuleSet {
+		cfg.Env = append(os.Environ(), "GO111MODULE=" + goFuzzModule)
+	} else {
+		cfg.Env = append(os.Environ(), "GO111MODULE=off")
+	}
 	return cfg
 }