gopls/internal/regtest: re-enable android builder
Remove the exception for the Android amd64 builder, now that flakes are
fixed (though the exception didn't actually work anyway due to
golang/go#39460).
Also, accept the import reorganization applied by gopls.
Fixes golang/go#43554
Change-Id: I9a7cce35998cfa673699d74a487111e4daecf7ec
Reviewed-on: https://go-review.googlesource.com/c/tools/+/284935
Trust: Robert Findley <rfindley@google.com>
Run-TryBot: Robert Findley <rfindley@google.com>
gopls-CI: kokoro <noreply+kokoro@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Rebecca Stambler <rstambler@golang.org>
diff --git a/gopls/internal/regtest/runner.go b/gopls/internal/regtest/runner.go
index 1e77cb8..3348040 100644
--- a/gopls/internal/regtest/runner.go
+++ b/gopls/internal/regtest/runner.go
@@ -8,7 +8,6 @@
"bytes"
"context"
"fmt"
- exec "golang.org/x/sys/execabs"
"io"
"io/ioutil"
"net"
@@ -20,6 +19,8 @@
"testing"
"time"
+ exec "golang.org/x/sys/execabs"
+
"golang.org/x/tools/gopls/internal/hooks"
"golang.org/x/tools/internal/jsonrpc2"
"golang.org/x/tools/internal/jsonrpc2/servertest"
@@ -308,7 +309,6 @@
"netbsd-arm-bsiegert": "",
"solaris-amd64-oraclerel": "",
"windows-arm-zx2c4": "",
- "android-amd64-emu": "golang.org/issue/43554",
}
func checkBuilder(t *testing.T) {
