mirror of https://github.com/golang/go.git
Revert "cmd/go: evaluate root symlink in matchPackages"
This reverts CL 380057. Reason for revert: appears to have broken x/tools tests on macOS. Change-Id: If1340bcb9b78f7271798c4dd923553e33db7f72e Reviewed-on: https://go-review.googlesource.com/c/go/+/380294 Trust: Bryan Mills <bcmills@google.com> Run-TryBot: Bryan Mills <bcmills@google.com> TryBot-Result: Gopher Robot <gobot@golang.org> Reviewed-by: Emmanuel Odeke <emmanuel@orijtech.com>
This commit is contained in:
parent
b7fa0f941f
commit
0ef6dd7440
|
|
@ -54,11 +54,6 @@ func matchPackages(ctx context.Context, m *search.Match, tags map[string]bool, f
|
|||
)
|
||||
|
||||
walkPkgs := func(root, importPathRoot string, prune pruning) {
|
||||
// Follow root if it's a symlink so path == root comparisons don't
|
||||
// spuriously fail when root is a symlink and it points to path.
|
||||
if r, err := filepath.EvalSymlinks(root); err == nil {
|
||||
root = r
|
||||
}
|
||||
root = filepath.Clean(root)
|
||||
err := fsys.Walk(root, func(path string, fi fs.FileInfo, err error) error {
|
||||
if err != nil {
|
||||
|
|
|
|||
|
|
@ -1,20 +0,0 @@
|
|||
# Test that cmd/go follows the symlink and properly determines
|
||||
# the module boundary when the working directory is a symlink.
|
||||
|
||||
[!symlink] skip
|
||||
|
||||
symlink worksym -> workspace
|
||||
cd worksym
|
||||
go list all
|
||||
stdout example.com/workspace
|
||||
|
||||
-- workspace/go.work --
|
||||
go 1.18
|
||||
|
||||
use .
|
||||
-- workspace/go.mod --
|
||||
module example.com/workspace
|
||||
|
||||
go 1.18
|
||||
-- workspace/pkg.go --
|
||||
package workspace
|
||||
Loading…
Reference in New Issue