From d5427658963083d5bcb87c3c79aa2b13fa769715 Mon Sep 17 00:00:00 2001 From: Jay Conrod Date: Mon, 20 Sep 2021 16:41:06 -0700 Subject: [PATCH] cmd/go: disable gofuzzbeta build tag by default It was enabled by default on the dev.fuzz branch so that users could check in fuzz targets without breaking their builds. Now that dev.fuzz is merged to master, users should switch to a go1.18 release constraint instead. For #47037 Change-Id: I0475368eb4570fe0c7027a3ae8f6950449c1a9ca Reviewed-on: https://go-review.googlesource.com/c/go/+/351118 Trust: Jay Conrod Trust: Katie Hockman Run-TryBot: Jay Conrod TryBot-Result: Go Bot Reviewed-by: Katie Hockman --- src/cmd/go/internal/cfg/cfg.go | 3 -- src/cmd/go/testdata/script/test_fuzz_tag.txt | 31 -------------------- 2 files changed, 34 deletions(-) delete mode 100644 src/cmd/go/testdata/script/test_fuzz_tag.txt diff --git a/src/cmd/go/internal/cfg/cfg.go b/src/cmd/go/internal/cfg/cfg.go index dd0e8cbbd66..b9632ea3c9d 100644 --- a/src/cmd/go/internal/cfg/cfg.go +++ b/src/cmd/go/internal/cfg/cfg.go @@ -61,9 +61,6 @@ var ( func defaultContext() build.Context { ctxt := build.Default - // TODO(#47037): remove this tag before merging to master. - ctxt.BuildTags = []string{"gofuzzbeta"} - ctxt.JoinPath = filepath.Join // back door to say "do not use go command" ctxt.GOROOT = findGOROOT() diff --git a/src/cmd/go/testdata/script/test_fuzz_tag.txt b/src/cmd/go/testdata/script/test_fuzz_tag.txt deleted file mode 100644 index 07ed5d6d612..00000000000 --- a/src/cmd/go/testdata/script/test_fuzz_tag.txt +++ /dev/null @@ -1,31 +0,0 @@ -# Check that the gofuzzbeta tag is enabled by default and can be disabled. -# TODO(jayconrod,katiehockman): before merging to master, restore the old -# default and delete this test. - -[short] skip - -go test -list=. -stdout Test -stdout Fuzz - -go test -tags= - --- go.mod -- -module fuzz - -go 1.17 --- fuzz_test.go -- -// +build gofuzzbeta - -package fuzz - -import "testing" - -func Fuzz(f *testing.F) { - f.Add([]byte(nil)) - f.Fuzz(func(*testing.T, []byte) {}) -} - -func Test(*testing.T) {} --- empty_test.go -- -package fuzz