From f79515f338230420deefba76e168cfd29f52942d Mon Sep 17 00:00:00 2001 From: Ian Cottrell Date: Thu, 10 Oct 2019 23:06:52 -0400 Subject: [PATCH] gopls: control features for command line tests A general mechanism for modifying the features in command line tests Use it to turn of go-diff for now Fixes golang/go#35392 Change-Id: Ie79723e94fb14fcde1e98709a63f44046e101bc4 Reviewed-on: https://go-review.googlesource.com/c/tools/+/205739 Run-TryBot: Ian Cottrell Reviewed-by: Rebecca Stambler TryBot-Result: Gobot Gobot --- gopls/test/gopls_test.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gopls/test/gopls_test.go b/gopls/test/gopls_test.go index 15ecfa4cbe..d57a9a6abb 100644 --- a/gopls/test/gopls_test.go +++ b/gopls/test/gopls_test.go @@ -11,6 +11,7 @@ import ( "golang.org/x/tools/go/packages/packagestest" "golang.org/x/tools/gopls/internal/hooks" cmdtest "golang.org/x/tools/internal/lsp/cmd/test" + "golang.org/x/tools/internal/lsp/source" "golang.org/x/tools/internal/lsp/tests" "golang.org/x/tools/internal/testenv" ) @@ -24,6 +25,12 @@ func TestCommandLine(t *testing.T) { packagestest.TestAll(t, testCommandLine) } +func commandLineOptions(options *source.Options) { + options.StaticCheck = true + options.GoDiff = false + hooks.Options(options) +} + func testCommandLine(t *testing.T, exporter packagestest.Exporter) { const testdata = "../../internal/lsp/testdata" if stat, err := os.Stat(testdata); err != nil || !stat.IsDir() { @@ -31,5 +38,5 @@ func testCommandLine(t *testing.T, exporter packagestest.Exporter) { } data := tests.Load(t, exporter, testdata) defer data.Exported.Cleanup() - tests.Run(t, cmdtest.NewRunner(exporter, data, tests.Context(t), hooks.Options), data) + tests.Run(t, cmdtest.NewRunner(exporter, data, tests.Context(t), commandLineOptions), data) }