Update dependencies (#2623)

All dependencies are updated to their most recent versions.

The following two patches are deleted, since Gazelle now generates the
targets they used to add.

com_github_golang_protobuf-extras.patch
org_golang_x_tools-extras.patch

Fixes #2615

4 files changed, 221 insertions, 177 deletions

diff --git a/tests/integration/popular_repos/BUILD.bazel b/tests/integration/popular_repos/BUILD.bazel
index 3ac44f7e..10312342 100644
--- a/tests/integration/popular_repos/BUILD.bazel
+++ b/tests/integration/popular_repos/BUILD.bazel
@@ -144,38 +144,38 @@ test_suite(
 test_suite(
     name = "org_golang_x_tools",
     tests = [
-        "@org_golang_x_tools//benchmark/parse:go_default_test",
-        "@org_golang_x_tools//cmd/benchcmp:go_default_test",
-        "@org_golang_x_tools//cmd/digraph:go_default_test",
-        "@org_golang_x_tools//cmd/getgo:go_default_test",
-        "@org_golang_x_tools//cmd/go-contrib-init:go_default_test",
-        "@org_golang_x_tools//cmd/splitdwarf/internal/macho:go_default_test",
-        "@org_golang_x_tools//cover:go_default_test",
-        "@org_golang_x_tools//go/analysis/internal/analysisflags:go_default_test",
-        "@org_golang_x_tools//go/ast/astutil:go_default_test",
-        "@org_golang_x_tools//go/callgraph/static:go_default_test",
-        "@org_golang_x_tools//go/cfg:go_default_test",
-        "@org_golang_x_tools//go/types/objectpath:go_default_test",
-        "@org_golang_x_tools//go/vcs:go_default_test",
-        "@org_golang_x_tools//godoc/redirect:go_default_test",
-        "@org_golang_x_tools//godoc/vfs:go_default_test",
-        "@org_golang_x_tools//godoc/vfs/gatefs:go_default_test",
-        "@org_golang_x_tools//godoc/vfs/mapfs:go_default_test",
-        "@org_golang_x_tools//internal/event:go_default_test",
-        "@org_golang_x_tools//internal/event/export:go_default_test",
-        "@org_golang_x_tools//internal/event/export/ocagent:go_default_test",
-        "@org_golang_x_tools//internal/event/export/ocagent/wire:go_default_test",
-        "@org_golang_x_tools//internal/event/label:go_default_test",
-        "@org_golang_x_tools//internal/fastwalk:go_default_test",
-        "@org_golang_x_tools//internal/gopathwalk:go_default_test",
-        "@org_golang_x_tools//internal/jsonrpc2:go_default_test",
-        "@org_golang_x_tools//internal/jsonrpc2/servertest:go_default_test",
-        "@org_golang_x_tools//internal/lsp/debug:go_default_test",
-        "@org_golang_x_tools//internal/memoize:go_default_test",
-        "@org_golang_x_tools//internal/proxydir:go_default_test",
-        "@org_golang_x_tools//internal/span:go_default_test",
-        "@org_golang_x_tools//playground/socket:go_default_test",
-        "@org_golang_x_tools//txtar:go_default_test",
+        "@org_golang_x_tools//benchmark/parse:parse_test",
+        "@org_golang_x_tools//cmd/benchcmp:benchcmp_test",
+        "@org_golang_x_tools//cmd/digraph:digraph_test",
+        "@org_golang_x_tools//cmd/getgo:getgo_test",
+        "@org_golang_x_tools//cmd/go-contrib-init:go-contrib-init_test",
+        "@org_golang_x_tools//cmd/splitdwarf/internal/macho:macho_test",
+        "@org_golang_x_tools//cover:cover_test",
+        "@org_golang_x_tools//go/analysis/internal/analysisflags:analysisflags_test",
+        "@org_golang_x_tools//go/ast/astutil:astutil_test",
+        "@org_golang_x_tools//go/callgraph/static:static_test",
+        "@org_golang_x_tools//go/cfg:cfg_test",
+        "@org_golang_x_tools//go/types/objectpath:objectpath_test",
+        "@org_golang_x_tools//go/vcs:vcs_test",
+        "@org_golang_x_tools//godoc/redirect:redirect_test",
+        "@org_golang_x_tools//godoc/vfs:vfs_test",
+        "@org_golang_x_tools//godoc/vfs/gatefs:gatefs_test",
+        "@org_golang_x_tools//godoc/vfs/mapfs:mapfs_test",
+        "@org_golang_x_tools//internal/event:event_test",
+        "@org_golang_x_tools//internal/event/export:export_test",
+        "@org_golang_x_tools//internal/event/export/ocagent:ocagent_test",
+        "@org_golang_x_tools//internal/event/export/ocagent/wire:wire_test",
+        "@org_golang_x_tools//internal/event/label:label_test",
+        "@org_golang_x_tools//internal/fastwalk:fastwalk_test",
+        "@org_golang_x_tools//internal/gopathwalk:gopathwalk_test",
+        "@org_golang_x_tools//internal/jsonrpc2:jsonrpc2_test",
+        "@org_golang_x_tools//internal/jsonrpc2/servertest:servertest_test",
+        "@org_golang_x_tools//internal/memoize:memoize_test",
+        "@org_golang_x_tools//internal/proxydir:proxydir_test",
+        "@org_golang_x_tools//internal/span:span_test",
+        "@org_golang_x_tools//internal/stack:stack_test",
+        "@org_golang_x_tools//playground/socket:socket_test",
+        "@org_golang_x_tools//txtar:txtar_test",
     ],
 )
 
@@ -195,3 +195,16 @@ test_suite(
         "@org_golang_x_sync//syncmap:go_default_test",
     ],
 )
+
+test_suite(
+    name = "org_golang_x_mod",
+    tests = [
+        "@org_golang_x_mod//modfile:go_default_test",
+        "@org_golang_x_mod//module:go_default_test",
+        "@org_golang_x_mod//semver:go_default_test",
+        "@org_golang_x_mod//sumdb:go_default_test",
+        "@org_golang_x_mod//sumdb/dirhash:go_default_test",
+        "@org_golang_x_mod//sumdb/note:go_default_test",
+        "@org_golang_x_mod//sumdb/storage:go_default_test",
+    ],
+)
diff --git a/tests/integration/popular_repos/README.rst b/tests/integration/popular_repos/README.rst
index 2b769fce..aeff2d06 100644
--- a/tests/integration/popular_repos/README.rst
+++ b/tests/integration/popular_repos/README.rst
@@ -143,38 +143,38 @@ __________________
 
 This runs tests from the repository `golang.org/x/tools <https://golang.org/x/tools>`_
 
-* @org_golang_x_tools//benchmark/parse:go_default_test
-* @org_golang_x_tools//cmd/benchcmp:go_default_test
-* @org_golang_x_tools//cmd/digraph:go_default_test
-* @org_golang_x_tools//cmd/getgo:go_default_test
-* @org_golang_x_tools//cmd/go-contrib-init:go_default_test
-* @org_golang_x_tools//cmd/splitdwarf/internal/macho:go_default_test
-* @org_golang_x_tools//cover:go_default_test
-* @org_golang_x_tools//go/analysis/internal/analysisflags:go_default_test
-* @org_golang_x_tools//go/ast/astutil:go_default_test
-* @org_golang_x_tools//go/callgraph/static:go_default_test
-* @org_golang_x_tools//go/cfg:go_default_test
-* @org_golang_x_tools//go/types/objectpath:go_default_test
-* @org_golang_x_tools//go/vcs:go_default_test
-* @org_golang_x_tools//godoc/redirect:go_default_test
-* @org_golang_x_tools//godoc/vfs:go_default_test
-* @org_golang_x_tools//godoc/vfs/gatefs:go_default_test
-* @org_golang_x_tools//godoc/vfs/mapfs:go_default_test
-* @org_golang_x_tools//internal/event:go_default_test
-* @org_golang_x_tools//internal/event/export:go_default_test
-* @org_golang_x_tools//internal/event/export/ocagent:go_default_test
-* @org_golang_x_tools//internal/event/export/ocagent/wire:go_default_test
-* @org_golang_x_tools//internal/event/label:go_default_test
-* @org_golang_x_tools//internal/fastwalk:go_default_test
-* @org_golang_x_tools//internal/gopathwalk:go_default_test
-* @org_golang_x_tools//internal/jsonrpc2:go_default_test
-* @org_golang_x_tools//internal/jsonrpc2/servertest:go_default_test
-* @org_golang_x_tools//internal/lsp/debug:go_default_test
-* @org_golang_x_tools//internal/memoize:go_default_test
-* @org_golang_x_tools//internal/proxydir:go_default_test
-* @org_golang_x_tools//internal/span:go_default_test
-* @org_golang_x_tools//playground/socket:go_default_test
-* @org_golang_x_tools//txtar:go_default_test
+* @org_golang_x_tools//benchmark/parse:parse_test
+* @org_golang_x_tools//cmd/benchcmp:benchcmp_test
+* @org_golang_x_tools//cmd/digraph:digraph_test
+* @org_golang_x_tools//cmd/getgo:getgo_test
+* @org_golang_x_tools//cmd/go-contrib-init:go-contrib-init_test
+* @org_golang_x_tools//cmd/splitdwarf/internal/macho:macho_test
+* @org_golang_x_tools//cover:cover_test
+* @org_golang_x_tools//go/analysis/internal/analysisflags:analysisflags_test
+* @org_golang_x_tools//go/ast/astutil:astutil_test
+* @org_golang_x_tools//go/callgraph/static:static_test
+* @org_golang_x_tools//go/cfg:cfg_test
+* @org_golang_x_tools//go/types/objectpath:objectpath_test
+* @org_golang_x_tools//go/vcs:vcs_test
+* @org_golang_x_tools//godoc/redirect:redirect_test
+* @org_golang_x_tools//godoc/vfs:vfs_test
+* @org_golang_x_tools//godoc/vfs/gatefs:gatefs_test
+* @org_golang_x_tools//godoc/vfs/mapfs:mapfs_test
+* @org_golang_x_tools//internal/event:event_test
+* @org_golang_x_tools//internal/event/export:export_test
+* @org_golang_x_tools//internal/event/export/ocagent:ocagent_test
+* @org_golang_x_tools//internal/event/export/ocagent/wire:wire_test
+* @org_golang_x_tools//internal/event/label:label_test
+* @org_golang_x_tools//internal/fastwalk:fastwalk_test
+* @org_golang_x_tools//internal/gopathwalk:gopathwalk_test
+* @org_golang_x_tools//internal/jsonrpc2:jsonrpc2_test
+* @org_golang_x_tools//internal/jsonrpc2/servertest:servertest_test
+* @org_golang_x_tools//internal/memoize:memoize_test
+* @org_golang_x_tools//internal/proxydir:proxydir_test
+* @org_golang_x_tools//internal/span:span_test
+* @org_golang_x_tools//internal/stack:stack_test
+* @org_golang_x_tools//playground/socket:socket_test
+* @org_golang_x_tools//txtar:txtar_test
 
 
 com_github_golang_glog
@@ -196,3 +196,17 @@ This runs tests from the repository `golang.org/x/sync <https://golang.org/x/syn
 * @org_golang_x_sync//syncmap:go_default_test
 
 
+org_golang_x_mod
+________________
+
+This runs tests from the repository `golang.org/x/mod <https://golang.org/x/mod>`_
+
+* @org_golang_x_mod//modfile:go_default_test
+* @org_golang_x_mod//module:go_default_test
+* @org_golang_x_mod//semver:go_default_test
+* @org_golang_x_mod//sumdb:go_default_test
+* @org_golang_x_mod//sumdb/dirhash:go_default_test
+* @org_golang_x_mod//sumdb/note:go_default_test
+* @org_golang_x_mod//sumdb/storage:go_default_test
+
+
diff --git a/tests/integration/popular_repos/popular_repos.bzl b/tests/integration/popular_repos/popular_repos.bzl
index 6cf0eefb..25024a4f 100644
--- a/tests/integration/popular_repos/popular_repos.bzl
+++ b/tests/integration/popular_repos/popular_repos.bzl
@@ -67,3 +67,9 @@ def popular_repos():
         importpath = "golang.org/x/sync",
         commit = "112230192c580c3556b8cee6403af37a4fc5f28c",
     )
+    _maybe(
+        go_repository,
+        name = "org_golang_x_mod",
+        importpath = "golang.org/x/mod",
+        commit = "c0d644d00ab849f4506f17a98a5740bf0feff020",
+    )
diff --git a/tests/integration/popular_repos/popular_repos.py b/tests/integration/popular_repos/popular_repos.py
index 2aef4e14..8fcb11ba 100755
--- a/tests/integration/popular_repos/popular_repos.py
+++ b/tests/integration/popular_repos/popular_repos.py
@@ -76,119 +76,120 @@ POPULAR_REPOS = [
         importpath = "golang.org/x/tools",
         commit = "11eff242d136374289f76e9313c76e9312391172",
         excludes = [
-            "blog:go_default_test", # Needs goldmark
-            "cmd/bundle:go_default_test", # Needs testdata directory
-            "cmd/callgraph/testdata/src/pkg:go_default_test", # is testdata
-            "cmd/callgraph:go_default_test", # Needs testdata directory
-            "cmd/cover:go_default_test", # Needs testdata directory
-            "cmd/fiximports:go_default_test", # requires working GOROOT, not present in CI.
-            "cmd/godoc:go_default_test", # TODO(#417)
-            "cmd/gorename:go_default_test", # TODO(#417)
-            "cmd/guru/testdata/src/referrers:go_default_test", # Not a real test
-            "cmd/guru:go_default_test", # Needs testdata directory
-            "cmd/stringer:go_default_test", # Needs testdata directory
-            "container/intsets:go_default_test", # TODO(#413): External test depends on symbols defined in internal test.
-            "go/analysis/analysistest:go_default_test", # requires build cache
-            "go/analysis/internal/checker:go_default_test", # loads test package with go/packages, which probably needs go list
-            "go/analysis/internal/facts:go_default_test", # loads test package with go/packages, which probably needs go list
-            "go/analysis/multichecker:go_default_test", # requires go vet
-            "go/analysis/passes/asmdecl:go_default_test", # Needs testdata directory
-            "go/analysis/passes/assign:go_default_test", # Needs testdata directory
-            "go/analysis/passes/atomic:go_default_test", # Needs testdata directory
-            "go/analysis/passes/atomicalign:go_default_test", # requires go list
-            "go/analysis/passes/bools:go_default_test", # Needs testdata directory
-            "go/analysis/passes/buildssa:go_default_test", # Needs testdata directory
-            "go/analysis/passes/buildtag:go_default_test", # Needs testdata directory
-            "go/analysis/passes/cgocall:go_default_test", # Needs testdata directory
-            "go/analysis/passes/composite:go_default_test", # Needs testdata directory
-            "go/analysis/passes/copylock:go_default_test", # Needs testdata directory
-            "go/analysis/passes/ctrlflow:go_default_test", # Needs testdata directory
-            "go/analysis/passes/deepequalerrors:go_default_test", # requires go list
-            "go/analysis/passes/errorsas:go_default_test", # requires go list and testdata
-            "go/analysis/passes/findcall:go_default_test", # requires build cache
-            "go/analysis/passes/httpresponse:go_default_test", # Needs testdata directory
-            "go/analysis/passes/ifaceassert:go_default_test", # Needs GOROOT
-            "go/analysis/passes/loopclosure:go_default_test", # Needs testdata directory
-            "go/analysis/passes/lostcancel:go_default_test", # Needs testdata directory
-            "go/analysis/passes/nilfunc:go_default_test", # Needs testdata directory
-            "go/analysis/passes/nilness:go_default_test", # Needs testdata directory
-            "go/analysis/passes/pkgfact:go_default_test", # requires go list
-            "go/analysis/passes/printf:go_default_test", # Needs testdata directory
-            "go/analysis/passes/shadow:go_default_test", # Needs testdata directory
-            "go/analysis/passes/shift:go_default_test", # Needs testdata directory
-            "go/analysis/passes/sortslice:go_default_test", # Needs 'go list'
-            "go/analysis/passes/stdmethods:go_default_test", # Needs testdata directory
-            "go/analysis/passes/stringintconv:go_default_test", # Needs 'go list'
-            "go/analysis/passes/structtag:go_default_test", # Needs testdata directory
-            "go/analysis/passes/testinggoroutine:go_default_test", # Need 'go env'
-            "go/analysis/passes/tests/testdata/src/a:go_default_test", # Not a real test
-            "go/analysis/passes/tests/testdata/src/b_x_test:go_default_test", # Not a real test
-            "go/analysis/passes/tests/testdata/src/divergent:go_default_test", # Not a real test
-            "go/analysis/passes/tests:go_default_test", # Needs testdata directory
-            "go/analysis/passes/unmarshal:go_default_test", # Needs go list
-            "go/analysis/passes/unreachable:go_default_test", # Needs testdata directory
-            "go/analysis/passes/unsafeptr:go_default_test", # Needs testdata directory
-            "go/analysis/passes/unusedresult:go_default_test", # Needs testdata directory
-            "go/analysis/unitchecker:go_default_test", # requires go vet
-            "go/ast/inspector:go_default_test", # requires GOROOT and GOPATH
-            "go/buildutil:go_default_test", # Needs testdata directory
-            "go/callgraph/cha:go_default_test", # Needs testdata directory
-            "go/callgraph/rta:go_default_test", # Needs testdata directory
-            "go/expect:go_default_test", # Needs testdata directory
-            "go/gccgoexportdata:go_default_test", # Needs testdata directory
-            "go/gcexportdata:go_default_test", # Needs testdata directory
-            "go/internal/gccgoimporter:go_default_test", # Needs testdata directory
-            "go/internal/gcimporter:go_default_test", # Needs testdata directory
-            "go/loader:go_default_test", # Needs testdata directory
-            "go/packages/packagestest/testdata/groups/two/primarymod/expect:go_default_test", # Is testdata
-            "go/packages/packagestest/testdata:go_default_test", # Is testdata
-            "go/packages/packagestest:go_default_test", # requires build cache
-            "go/packages:go_default_test", # Hah!
-            "go/pointer:go_default_test", # Needs testdata directory
-            "go/ssa/interp:go_default_test", # Needs testdata directory
-            "go/ssa/ssautil:go_default_test", # Needs testdata directory
-            "go/ssa:go_default_test", # Needs testdata directory
-            "go/types/typeutil:go_default_test", # requires GOROOT
-            "godoc/static:go_default_test", # requires data files
-            "godoc/vfs/zipfs:go_default_test", # requires GOROOT
-            "godoc:go_default_test", # requires GOROOT and GOPATH
-            "internal/apidiff:go_default_test", # Needs testdata directory
-            "internal/gocommand:go_default_test", # Needs go tool
-            "internal/imports:go_default_test", # Needs testdata directory
-            "internal/lsp/analysis/fillreturns:go_default_test", # Needs go tool
-            "internal/lsp/analysis/nonewvars:go_default_test", # Needs GOROOT
-            "internal/lsp/analysis/noresultvalues:go_default_test", # Needs GOROOT
-            "internal/lsp/analysis/simplifycompositelit:go_default_test", # Needs go tool
-            "internal/lsp/analysis/simplifyrange:go_default_test", # Needs GOROOT
-            "internal/lsp/analysis/simplifyslice:go_default_test", # Needs GOROOT
-            "internal/lsp/analysis/undeclaredname:go_default_test", # Needs GOROOT
-            "internal/lsp/analysis/unusedparams:go_default_test", # Needs go tool
-            "internal/lsp/cache:go_default_test", # has additional deps
-            "internal/lsp/cmd:go_default_test", # panics?
-            "internal/lsp/diff/difftest:go_default_test", # has additional deps
-            "internal/lsp/diff/myers:go_default_test", # has additional deps
-            "internal/lsp/diff:go_default_test", # has additional deps
-            "internal/lsp/fake:go_default_test", # has additional deps
-            "internal/lsp/fuzzy:go_default_test", # has additional deps
-            "internal/lsp/lsprpc:go_default_test", # has additional deps
-            "internal/lsp/mod:go_default_test", # has additional deps
-            "internal/lsp/regtest:go_default_test", # has additional deps
-            "internal/lsp/snippet:go_default_test", # has additional deps
-            "internal/lsp/source:go_default_test", # Needs testdata directory
-            "internal/lsp/testdata/lsp/primarymod/analyzer:go_default_test", # not a real test
-            "internal/lsp/testdata/lsp/primarymod/codelens:go_default_test", # Is testdata
-            "internal/lsp/testdata/lsp/primarymod/godef/a:go_default_test", # not a real test
-            "internal/lsp/testdata/lsp/primarymod/implementation/other:go_default_test", # not a real test
-            "internal/lsp/testdata/lsp/primarymod/references:go_default_test", # not a real test
-            "internal/lsp/testdata/lsp/primarymod/rename/testy:go_default_test", # not a real test
-            "internal/lsp/testdata/lsp/primarymod/signature:go_default_test", # Is testdata
-            "internal/lsp/testdata/lsp/primarymod/testy:go_default_test", # not a real test
-            "internal/lsp/testdata/lsp/primarymod/unimported:go_default_test", # not a real test
-            "internal/lsp:go_default_test", # Needs testdata directory
-            "present:go_default_test", # Needs goldmark
-            "refactor/eg:go_default_test", # Needs testdata directory
-            "refactor/importgraph:go_default_test", # TODO(#417)
-            "refactor/rename:go_default_test", # TODO(#417)
+            "blog:blog_test", # Needs goldmark
+            "cmd/bundle:bundle_test", # Needs testdata directory
+            "cmd/callgraph/testdata/src/pkg:pkg_test", # is testdata
+            "cmd/callgraph:callgraph_test", # Needs testdata directory
+            "cmd/cover:cover_test", # Needs testdata directory
+            "cmd/fiximports:fiximports_test", # requires working GOROOT, not present in CI.
+            "cmd/godoc:godoc_test", # TODO(#417)
+            "cmd/gorename:gorename_test", # TODO(#417)
+            "cmd/guru/testdata/src/referrers:referrers_test", # Not a real test
+            "cmd/guru:guru_test", # Needs testdata directory
+            "cmd/stringer:stringer_test", # Needs testdata directory
+            "container/intsets:intsets_test", # TODO(#413): External test depends on symbols defined in internal test.
+            "go/analysis/analysistest:analysistest_test", # requires build cache
+            "go/analysis/internal/checker:checker_test", # loads test package with go/packages, which probably needs go list
+            "go/analysis/internal/facts:facts_test", # loads test package with go/packages, which probably needs go list
+            "go/analysis/multichecker:multichecker_test", # requires go vet
+            "go/analysis/passes/asmdecl:asmdecl_test", # Needs testdata directory
+            "go/analysis/passes/assign:assign_test", # Needs testdata directory
+            "go/analysis/passes/atomic:atomic_test", # Needs testdata directory
+            "go/analysis/passes/atomicalign:atomicalign_test", # requires go list
+            "go/analysis/passes/bools:bools_test", # Needs testdata directory
+            "go/analysis/passes/buildssa:buildssa_test", # Needs testdata directory
+            "go/analysis/passes/buildtag:buildtag_test", # Needs testdata directory
+            "go/analysis/passes/cgocall:cgocall_test", # Needs testdata directory
+            "go/analysis/passes/composite:composite_test", # Needs testdata directory
+            "go/analysis/passes/copylock:copylock_test", # Needs testdata directory
+            "go/analysis/passes/ctrlflow:ctrlflow_test", # Needs testdata directory
+            "go/analysis/passes/deepequalerrors:deepequalerrors_test", # requires go list
+            "go/analysis/passes/errorsas:errorsas_test", # requires go list and testdata
+            "go/analysis/passes/findcall:findcall_test", # requires build cache
+            "go/analysis/passes/httpresponse:httpresponse_test", # Needs testdata directory
+            "go/analysis/passes/ifaceassert:ifaceassert_test", # Needs GOROOT
+            "go/analysis/passes/loopclosure:loopclosure_test", # Needs testdata directory
+            "go/analysis/passes/lostcancel:lostcancel_test", # Needs testdata directory
+            "go/analysis/passes/nilfunc:nilfunc_test", # Needs testdata directory
+            "go/analysis/passes/nilness:nilness_test", # Needs testdata directory
+            "go/analysis/passes/pkgfact:pkgfact_test", # requires go list
+            "go/analysis/passes/printf:printf_test", # Needs testdata directory
+            "go/analysis/passes/shadow:shadow_test", # Needs testdata directory
+            "go/analysis/passes/shift:shift_test", # Needs testdata directory
+            "go/analysis/passes/sortslice:sortslice_test", # Needs 'go list'
+            "go/analysis/passes/stdmethods:stdmethods_test", # Needs testdata directory
+            "go/analysis/passes/stringintconv:stringintconv_test", # Needs 'go list'
+            "go/analysis/passes/structtag:structtag_test", # Needs testdata directory
+            "go/analysis/passes/testinggoroutine:testinggoroutine_test", # Need 'go env'
+            "go/analysis/passes/tests/testdata/src/a:a_test", # Not a real test
+            "go/analysis/passes/tests/testdata/src/b_x_test:b_x_test_test", # Not a real test
+            "go/analysis/passes/tests/testdata/src/divergent:divergent_test", # Not a real test
+            "go/analysis/passes/tests:tests_test", # Needs testdata directory
+            "go/analysis/passes/unmarshal:unmarshal_test", # Needs go list
+            "go/analysis/passes/unreachable:unreachable_test", # Needs testdata directory
+            "go/analysis/passes/unsafeptr:unsafeptr_test", # Needs testdata directory
+            "go/analysis/passes/unusedresult:unusedresult_test", # Needs testdata directory
+            "go/analysis/unitchecker:unitchecker_test", # requires go vet
+            "go/ast/inspector:inspector_test", # requires GOROOT and GOPATH
+            "go/buildutil:buildutil_test", # Needs testdata directory
+            "go/callgraph/cha:cha_test", # Needs testdata directory
+            "go/callgraph/rta:rta_test", # Needs testdata directory
+            "go/expect:expect_test", # Needs testdata directory
+            "go/gccgoexportdata:gccgoexportdata_test", # Needs testdata directory
+            "go/gcexportdata:gcexportdata_test", # Needs testdata directory
+            "go/internal/gccgoimporter:gccgoimporter_test", # Needs testdata directory
+            "go/internal/gcimporter:gcimporter_test", # Needs testdata directory
+            "go/loader:loader_test", # Needs testdata directory
+            "go/packages/packagestest/testdata/groups/two/primarymod/expect:expect_test", # Is testdata
+            "go/packages/packagestest/testdata:testdata_test", # Is testdata
+            "go/packages/packagestest:packagestest_test", # requires build cache
+            "go/packages:packages_test", # Hah!
+            "go/pointer:pointer_test", # Needs testdata directory
+            "go/ssa/interp:interp_test", # Needs testdata directory
+            "go/ssa/ssautil:ssautil_test", # Needs testdata directory
+            "go/ssa:ssa_test", # Needs testdata directory
+            "go/types/typeutil:typeutil_test", # requires GOROOT
+            "godoc/static:static_test", # requires data files
+            "godoc/vfs/zipfs:zipfs_test", # requires GOROOT
+            "godoc:godoc_test", # requires GOROOT and GOPATH
+            "internal/apidiff:apidiff_test", # Needs testdata directory
+            "internal/gocommand:gocommand_test", # Needs go tool
+            "internal/imports:imports_test", # Needs testdata directory
+            "internal/lsp/analysis/fillreturns:fillreturns_test", # Needs go tool
+            "internal/lsp/analysis/fillstruct:fillstruct_test", # Needs go tool
+            "internal/lsp/analysis/nonewvars:nonewvars_test", # Needs GOROOT
+            "internal/lsp/analysis/noresultvalues:noresultvalues_test", # Needs GOROOT
+            "internal/lsp/analysis/simplifycompositelit:simplifycompositelit_test", # Needs go tool
+            "internal/lsp/analysis/simplifyrange:simplifyrange_test", # Needs GOROOT
+            "internal/lsp/analysis/simplifyslice:simplifyslice_test", # Needs GOROOT
+            "internal/lsp/analysis/undeclaredname:undeclaredname_test", # Needs GOROOT
+            "internal/lsp/analysis/unusedparams:unusedparams_test", # Needs go tool
+            "internal/lsp/cache:cache_test", # has additional deps
+            "internal/lsp/cmd:cmd_test", # panics?
+            "internal/lsp/diff/difftest:difftest_test", # has additional deps
+            "internal/lsp/diff/myers:myers_test", # has additional deps
+            "internal/lsp/diff:diff_test", # has additional deps
+            "internal/lsp/fake:fake_test", # has additional deps
+            "internal/lsp/fuzzy:fuzzy_test", # has additional deps
+            "internal/lsp/lsprpc:lsprpc_test", # has additional deps
+            "internal/lsp/mod:mod_test", # has additional deps
+            "internal/lsp/regtest:regtest_test", # has additional deps
+            "internal/lsp/snippet:snippet_test", # has additional deps
+            "internal/lsp/source:source_test", # Needs testdata directory
+            "internal/lsp/testdata/lsp/primarymod/analyzer:analyzer_test", # not a real test
+            "internal/lsp/testdata/lsp/primarymod/codelens:codelens_test", # Is testdata
+            "internal/lsp/testdata/lsp/primarymod/godef/a:a_test", # not a real test
+            "internal/lsp/testdata/lsp/primarymod/implementation/other:other_test", # not a real test
+            "internal/lsp/testdata/lsp/primarymod/references:references_test", # not a real test
+            "internal/lsp/testdata/lsp/primarymod/rename/testy:testy_test", # not a real test
+            "internal/lsp/testdata/lsp/primarymod/signature:signature_test", # Is testdata
+            "internal/lsp/testdata/lsp/primarymod/testy:testy_test", # not a real test
+            "internal/lsp/testdata/lsp/primarymod/unimported:unimported_test", # not a real test
+            "internal/lsp:lsp_test", # Needs testdata directory
+            "present:present_test", # Needs goldmark
+            "refactor/eg:eg_test", # Needs testdata directory
+            "refactor/importgraph:importgraph_test", # TODO(#417)
+            "refactor/rename:rename_test", # TODO(#417)
         ],
     ),
 
@@ -203,6 +204,16 @@ POPULAR_REPOS = [
         importpath = "golang.org/x/sync",
         commit = "112230192c580c3556b8cee6403af37a4fc5f28c",
     ),
+
+    dict(
+        name = "org_golang_x_mod",
+        importpath = "golang.org/x/mod",
+        commit = "c0d644d00ab849f4506f17a98a5740bf0feff020",
+        excludes = [
+            "sumdb/tlog:go_default_test", # Needs network, not available on RBE
+            "zip:go_default_test", # Needs vcs tools, not available on RBE
+        ],            
+    ),
   ]
 
 COPYRIGHT_HEADER = """