From 8cc2b73a7439e303d015e53176575e649ace68bf Mon Sep 17 00:00:00 2001 From: Michael Matloob Date: Mon, 30 Dec 2019 18:49:27 -0500 Subject: [PATCH] cmd/go: convert TestPluginNonMain to script framework TestPluginNonMain was broken before this change! (It provided the wrong directory for testdep/p2: testdata/testdep/p2 instead of testdata/src/testdep/p2). Change-Id: Ib815f119bae1d758b500cd8ad82c016cb630d71e Reviewed-on: https://go-review.googlesource.com/c/go/+/212938 Run-TryBot: Michael Matloob TryBot-Result: Gobot Gobot Reviewed-by: Jay Conrod --- src/cmd/go/go_test.go | 14 -------------- .../testdata/script/build_plugin_non_main.txt | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 14 deletions(-) create mode 100644 src/cmd/go/testdata/script/build_plugin_non_main.txt diff --git a/src/cmd/go/go_test.go b/src/cmd/go/go_test.go index 5e332ae2acb280..2533c058fe6c21 100644 --- a/src/cmd/go/go_test.go +++ b/src/cmd/go/go_test.go @@ -2281,20 +2281,6 @@ func TestCoverageDashC(t *testing.T) { tg.wantExecutable(tg.path("coverdep"), "go -test -c -coverprofile did not create executable") } -func TestPluginNonMain(t *testing.T) { - wd, err := os.Getwd() - if err != nil { - t.Fatal(err) - } - - pkg := filepath.Join(wd, "testdata", "testdep", "p2") - - tg := testgo(t) - defer tg.cleanup() - - tg.runFail("build", "-buildmode=plugin", pkg) -} - func TestTestEmpty(t *testing.T) { if !canRace { t.Skip("no race detector") diff --git a/src/cmd/go/testdata/script/build_plugin_non_main.txt b/src/cmd/go/testdata/script/build_plugin_non_main.txt new file mode 100644 index 00000000000000..996d87d96129d1 --- /dev/null +++ b/src/cmd/go/testdata/script/build_plugin_non_main.txt @@ -0,0 +1,17 @@ +# Plugins are only supported on linux,cgo and darwin,cgo. +[!linux] [!darwin] skip +[!cgo] skip + +go build -n testdep/p2 +! go build -buildmode=plugin testdep/p2 +stderr '-buildmode=plugin requires exactly one main package' + +-- testdep/p1/p1.go -- +package p1 +-- testdep/p1/p1_test.go -- +package p1 + +import _ "testdep/p2" +-- testdep/p2/p2.go -- +package p2 +