[release-branch.go1.8] cmd/go: correct directory used in checkNestedVCS test

This error was not used when using git because nested git is permitted.
Add test using Mercurial, so that at least we have a test, even though
the test is not run by default.

Fixes #22157
Fixes #22201

Change-Id: If521f3c09b0754e00e56fa3cd0364764a57a43ad
Reviewed-on: https://go-review.googlesource.com/69670
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Russ Cox <rsc@golang.org>
Reviewed-on: https://go-review.googlesource.com/70839
Run-TryBot: Russ Cox <rsc@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>

diff --git a/src/cmd/go/go_test.go b/src/cmd/go/go_test.go
index 00fd746e2e4a6a44d71fa7ab66bb2028f4cedecd..79734f90ed47f3fcedd244474d22b83f13f30a8c 100644 (file)
--- a/src/cmd/go/go_test.go
+++ b/src/cmd/go/go_test.go
@@ -1120,7 +1120,7 @@ func testMove(t *testing.T, vcs, url, base, config string) {
        tg.runFail("get", "-d", "-u", url)
        tg.grepStderr("is a custom import path for", "go get -d -u "+url+" failed for wrong reason")
        tg.runFail("get", "-d", "-f", "-u", url)
-       tg.grepStderr("validating server certificate|not found", "go get -d -f -u "+url+" failed for wrong reason")
+       tg.grepStderr("validating server certificate|[nN]ot [fF]ound", "go get -d -f -u "+url+" failed for wrong reason")
 }
 
 func TestInternalPackageErrorsAreHandled(t *testing.T) {
@@ -1141,10 +1141,9 @@ func TestMoveGit(t *testing.T) {
        testMove(t, "git", "rsc.io/pdf", "pdf", "rsc.io/pdf/.git/config")
 }
 
-// TODO(rsc): Set up a test case on bitbucket for hg.
-// func TestMoveHG(t *testing.T) {
-//     testMove(t, "hg", "rsc.io/x86/x86asm", "x86", "rsc.io/x86/.hg/hgrc")
-// }
+func TestMoveHG(t *testing.T) {
+       testMove(t, "hg", "vcs-test.golang.org/go/custom-hg-hello", "custom-hg-hello", "vcs-test.golang.org/go/custom-hg-hello/.hg/hgrc")
+}
 
 // TODO(rsc): Set up a test case on SourceForge (?) for svn.
 // func testMoveSVN(t *testing.T) {

diff --git a/src/cmd/go/vcs.go b/src/cmd/go/vcs.go
index 2b9f52f7ec3d7ed27fca7ebf3740567f45e4cf97..644a2482965e8c06e5b4fa8543323fc7c2249f61 100644 (file)
--- a/src/cmd/go/vcs.go
+++ b/src/cmd/go/vcs.go
@@ -548,7 +548,7 @@ func checkNestedVCS(vcs *vcsCmd, dir, srcRoot string) error {
        otherDir := dir
        for len(otherDir) > len(srcRoot) {
                for _, otherVCS := range vcsList {
-                       if _, err := os.Stat(filepath.Join(dir, "."+otherVCS.cmd)); err == nil {
+                       if _, err := os.Stat(filepath.Join(otherDir, "."+otherVCS.cmd)); err == nil {
                                // Allow expected vcs in original dir.
                                if otherDir == dir && otherVCS == vcs {
                                        continue