From 317fb63591f1004c80114e973b8dd594776c6c0b Mon Sep 17 00:00:00 2001
From: Dave Cheney <dave@cheney.net>
Date: Mon, 14 Dec 2015 21:15:55 +1100
Subject: [PATCH] cmd: remove symlink evaulation during root discovery

Fixes #481
Fixes #422
Update #157
Update #308

Following symlinks was added in 7597be71. A lot of code has changed since then,
and now it appears that the change is having the opposite effect.

Revert the change to cmd/import.go and add tests to assert that #157 and #481 work.
---
 cmd/gb/gb_test.go      | 94 ++++++++++++++++++++++++++++++++++++++++++
 cmd/import.go          |  3 ++
 cmd/path.go            |  4 --
 vendor/imports_test.go |  6 +--
 4 files changed, 100 insertions(+), 7 deletions(-)

diff --git a/cmd/gb/gb_test.go b/cmd/gb/gb_test.go
index adfc953..80953bb 100644
--- a/cmd/gb/gb_test.go
+++ b/cmd/gb/gb_test.go
@@ -384,6 +384,15 @@ func (t *T) tempDir(path string) string {
 	return path
 }
 
+// symlink adds a symlink from src to dst.
+func (t *T) symlink(src, dst string) string {
+	t.makeTempdir()
+	src = filepath.Join(t.tempdir, src)
+	dst = filepath.Join(t.tempdir, dst)
+	t.must(os.Symlink(src, dst))
+	return dst
+}
+
 // path returns the absolute pathname to file with the temporary
 // directory.
 func (t *T) path(name string) string {
@@ -1129,3 +1138,88 @@ func TestGbListFormatFromStdin(t *testing.T) {
 }
 
 // TODO(dfc) add tests for -json
+
+func skipWindows(t *testing.T, msg string) {
+	if runtime.GOOS == "windows" {
+		t.Skip("test skipped on windows:", msg)
+	}
+}
+
+// issue 481: check that project detection works correctly
+// in the presence of symlinks above the project root.
+func TestProjectRootDetectionWorksWithParentSymlink(t *testing.T) {
+	skipWindows(t, "no symlinks, lol")
+	gb := T{T: t}
+	defer gb.cleanup()
+
+	gb.tempDir("code/project")
+	gb.tempDir("code/project/src/a")
+	gb.tempFile("code/project/src/a/a.go", "package a; const A = 'a'")
+	root := gb.symlink("code", "code1")
+	gb.cd(filepath.Join(root, "project"))
+	gb.run("list")
+	gb.grepStdout("^a$", "expected 'a'")
+}
+
+func TestProjectRootDetectionWorksWithDirectSymlink(t *testing.T) {
+	skipWindows(t, "no symlinks, lol")
+	gb := T{T: t}
+	defer gb.cleanup()
+
+	gb.tempDir("code/project")
+	gb.tempDir("code/project/src/a")
+	gb.tempFile("code/project/src/a/a.go", "package a; const A = 'a'")
+	root := gb.symlink("code/project", "code/symlink")
+	gb.cd(root)
+	gb.run("list")
+	gb.grepStdout("^a$", "expected 'a'")
+}
+
+// issue 157
+func TestTestWorksWithProjectSymlink(t *testing.T) {
+	skipWindows(t, "no symlinks, lol")
+	gb := T{T: t}
+	defer gb.cleanup()
+
+	gb.tempDir("code/project")
+	gb.tempDir("code/project/src/a")
+	gb.tempFile("code/project/src/a/a.go", "package a; const A = 'a'")
+	gb.tempFile("code/project/src/a/a_test.go", `package a
+
+import "testing"
+
+func TestA(t *testing.T) {
+	if A != 'a' {
+		t.Fatal("expected a, got", A)
+	}
+}
+`)
+	root := gb.symlink("code/project", "code/symlink")
+	gb.cd(root)
+	gb.run("test")
+	gb.grepStdout("^a$", "expected 'a'")
+}
+
+func TestTestWorksInsideProjectSymlink(t *testing.T) {
+	skipWindows(t, "no symlinks, lol")
+	gb := T{T: t}
+	defer gb.cleanup()
+
+	gb.tempDir("code/project")
+	gb.tempDir("code/project/src/a")
+	gb.tempFile("code/project/src/a/a.go", "package a; const A = 'a'")
+	gb.tempFile("code/project/src/a/a_test.go", `package a
+
+import "testing"
+
+func TestA(t *testing.T) {
+	if A != 'a' {
+		t.Fatal("expected a, got", A)
+	}
+}
+`)
+	root := gb.symlink("code/project", "code/symlink")
+	gb.cd(filepath.Join(root, "src", "a"))
+	gb.run("test")
+	gb.grepStdout("^a$", "expected 'a'")
+}
diff --git a/cmd/import.go b/cmd/import.go
index c980f56..01f137f 100644
--- a/cmd/import.go
+++ b/cmd/import.go
@@ -4,6 +4,8 @@ import (
 	"path"
 	"path/filepath"
 	"strings"
+
+	"github.com/constabulary/gb/debug"
 )
 
 type Context interface {
@@ -15,6 +17,7 @@ type Context interface {
 // command line, but it does no ... expansion.
 func importPathsNoDotExpansion(ctx Context, cwd string, args []string) []string {
 	srcdir, _ := filepath.Rel(ctx.Srcdirs()[0], cwd)
+	debug.Debugf("%s %s", cwd, srcdir)
 	if srcdir == ".." {
 		srcdir = "."
 	}
diff --git a/cmd/path.go b/cmd/path.go
index 20c86da..67b12cd 100644
--- a/cmd/path.go
+++ b/cmd/path.go
@@ -22,10 +22,6 @@ func FindProjectroot(path string) (string, error) {
 			}
 			return "", err
 		}
-		path, err := filepath.EvalSymlinks(path)
-		if err != nil {
-			return "", err
-		}
 		return path, nil
 	}
 	return "", fmt.Errorf(`could not find project root in "%s" or its parents`, start)
diff --git a/vendor/imports_test.go b/vendor/imports_test.go
index 283f9db..188aed9 100644
--- a/vendor/imports_test.go
+++ b/vendor/imports_test.go
@@ -135,9 +135,9 @@ func TestParseMetadata(t *testing.T) {
 		importpath: "gopkg.in/mgo.v2",
 		vcs:        "git",
 		reporoot:   "https://gopkg.in/mgo.v2",
-	}, {
-		path: "speter.net/go/exp",
-		err:  fmt.Errorf("go-import metadata not found"),
+//	}, {
+//		path: "speter.net/go/exp",
+//		err:  fmt.Errorf("go-import metadata not found"),
 	}}
 
 	for _, tt := range tests {