From e8729a7e58d3a0212ecc65b3bf5a0b27ba4abf9f Mon Sep 17 00:00:00 2001 From: Michael Matloob Date: Mon, 30 Dec 2019 14:15:11 -0500 Subject: [PATCH] cmd/go: convert TestGoGenerateBadImports to script framework Part of converting all tests to script framework to improve test parallelism. Updates #36320 Updates #17751 Change-Id: Id1afafad2063d917fd55e08f0725ce3e93201c35 Reviewed-on: https://go-review.googlesource.com/c/go/+/212878 Run-TryBot: Michael Matloob TryBot-Result: Gobot Gobot Reviewed-by: Jay Conrod --- src/cmd/go/go_test.go | 14 -------------- .../go/testdata/script/generate_bad_imports.txt | 11 +++++++++++ src/cmd/go/testdata/src/gencycle/gencycle.go | 5 ----- 3 files changed, 11 insertions(+), 19 deletions(-) create mode 100644 src/cmd/go/testdata/script/generate_bad_imports.txt delete mode 100644 src/cmd/go/testdata/src/gencycle/gencycle.go diff --git a/src/cmd/go/go_test.go b/src/cmd/go/go_test.go index 364186ff53..626fd46c36 100644 --- a/src/cmd/go/go_test.go +++ b/src/cmd/go/go_test.go @@ -2738,20 +2738,6 @@ func TestGoGenerateXTestPkgName(t *testing.T) { } } -func TestGoGenerateBadImports(t *testing.T) { - if runtime.GOOS == "windows" { - t.Skip("skipping because windows has no echo command") - } - - // This package has an invalid import causing an import cycle, - // but go generate is supposed to still run. - tg := testgo(t) - defer tg.cleanup() - tg.setenv("GOPATH", filepath.Join(tg.pwd(), "testdata")) - tg.run("generate", "gencycle") - tg.grepStdout("hello world", "go generate gencycle did not run generator") -} - func TestGoGetCustomDomainWildcard(t *testing.T) { testenv.MustHaveExternalNetwork(t) testenv.MustHaveExecPath(t, "git") diff --git a/src/cmd/go/testdata/script/generate_bad_imports.txt b/src/cmd/go/testdata/script/generate_bad_imports.txt new file mode 100644 index 0000000000..59a2f5786b --- /dev/null +++ b/src/cmd/go/testdata/script/generate_bad_imports.txt @@ -0,0 +1,11 @@ +[windows] skip # skip because windows has no echo command + +go generate gencycle +stdout 'hello world' # check go generate gencycle ran the generator + +-- gencycle/gencycle.go -- +//go:generate echo hello world + +package gencycle + +import _ "gencycle" diff --git a/src/cmd/go/testdata/src/gencycle/gencycle.go b/src/cmd/go/testdata/src/gencycle/gencycle.go deleted file mode 100644 index 600afd93e9..0000000000 --- a/src/cmd/go/testdata/src/gencycle/gencycle.go +++ /dev/null @@ -1,5 +0,0 @@ -//go:generate echo hello world - -package gencycle - -import _ "gencycle" -- 2.48.1