[Pkg-golang-commits] [golang] 03/03: Add d/patches/issue-20284.patch to work around an upstream build-time issue.

[Michael Hudson-Doyle]

This is an automated email from the git hooks/post-receive script.

mwhudson-guest pushed a commit to branch golang-1.9
in repository golang.

commit 3dc59e4e02f1e18df7b48c68538577e0dd1f2d05
Author: Michael Hudson-Doyle <michael.hudson at canonical.com>
Date:   Thu Jun 15 14:40:40 2017 +1200

    Add d/patches/issue-20284.patch to work around an upstream build-time issue.
---
 debian/changelog                 |  2 ++
 debian/patches/issue-20284.patch | 37 +++++++++++++++++++++++++++++++++++++
 debian/patches/series            |  1 +
 3 files changed, 40 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5220876..5d01019 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 golang-1.9 (1.9~beta1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Add d/patches/issue-20284.patch to work around an upstream build-time
+    issue.
 
  -- Michael Hudson-Doyle <michael.hudson at ubuntu.com>  Thu, 15 Jun 2017 13:10:59 +1200
 
diff --git a/debian/patches/issue-20284.patch b/debian/patches/issue-20284.patch
new file mode 100644
index 0000000..03a7f6c
--- /dev/null
+++ b/debian/patches/issue-20284.patch
@@ -0,0 +1,37 @@
+Description: Skip test that fails with GOROOT_FINAL set.
+Author: Michael Hudson-Doyle <michael.hudson at ubuntu.com>
+Bug: https://github.com/golang/go/issues/20284
+Last-Update: 2017-06-15
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/cmd/go/go_test.go
++++ b/src/cmd/go/go_test.go
+@@ -4001,17 +4001,19 @@
+ 		equal = strings.EqualFold
+ 	}
+ 
++	// This part of the test fails when the go tool was built with
++	// GOROOT_FINAL set, see // https://github.com/golang/go/issues/20284
+ 	// macOS uses a symlink for /tmp.
+-	resolvedTestGOROOT, err := filepath.EvalSymlinks(testGOROOT)
+-	if err != nil {
+-		t.Fatalf("could not eval testgoroot symlinks: %v", err)
+-	}
++	// resolvedTestGOROOT, err := filepath.EvalSymlinks(testGOROOT)
++	// if err != nil {
++	// 	t.Fatalf("could not eval testgoroot symlinks: %v", err)
++	// }
+ 
+-	// Missing GOROOT/pkg/tool, the go tool should fall back to
+-	// its default path.
+-	if got, want := goroot(newGoTool), resolvedTestGOROOT; !equal(got, want) {
+-		t.Fatalf("%s env GOROOT = %q, want %q", newGoTool, got, want)
+-	}
++	// // Missing GOROOT/pkg/tool, the go tool should fall back to
++	// // its default path.
++	// if got, want := goroot(newGoTool), resolvedTestGOROOT; !equal(got, want) {
++	// 	t.Fatalf("%s env GOROOT = %q, want %q", newGoTool, got, want)
++	// }
+ 
+ 	// Now the executable's path looks like a GOROOT.
+ 	tg.tempDir("newgoroot/pkg/tool")
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..79f3597 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+issue-20284.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-golang/golang.git