Subject: [PATCH] gnu: [email-masked]: Fix test failure.

From: Alex Vong <[email-masked]>
Date: Sun, 16 Jul 2017 00:59:01 +0800

Tags: fixed-upstream
Forwarded: https://github.com/golang/go/issues/20007

Hello,

This patch fixes the test failure in core-updates. I've tried to
cherry-pick upstream's commit, but it doesn't work. So I fall back to
fix it directly instead. The bug has already been fixed upstream, and
the fix will be in the next release (1.9). See [0] for details.

From 023f866f8838df457639a38af9c2c733e445435d Mon Sep 17 00:00:00 2001
From: Alex Vong <[email-masked]>
Date: Sun, 16 Jul 2017 00:41:17 +0800
Subject: [PATCH] gnu: [email-masked]: Fix test failure.

* gnu/packages/golang.scm (go-1.8)[arguments]: Escape braces in test data in
'prebuild' phase.
---
 gnu/packages/golang.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 70cae6d87..884a49689 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2016, 2017 Petter <[email-masked]>
 ;;; Copyright © 2016, 2017 Leo Famulari <[email-masked]>
 ;;; Copyright © 2017 Sergei Trofimovich <[email-masked]>
+;;; Copyright © 2017 Alex Vong <[email-masked]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -296,6 +297,12 @@ sequential processes (CSP) concurrent programming features added.")
                  (substitute* "../misc/cgo/testcarchive/carchive_test.go"
                    (("#!/usr/bin/env") (string-append "#!" (which "env"))))
 
+                 ;; escape braces in test data to workaround test failure, see:
+                 ;; https://github.com/golang/go/issues/20007
+                 ;; FIXME: remove this once we upgrade to 1.9
+                 (substitute* "cmd/vet/testdata/copylock_func.go"
+                   (("struct\\{lock sync.Mutex\\}") "struct\\{lock sync.Mutex\\}"))
+
                  (substitute* "net/lookup_unix.go"
                    (("/etc/protocols") (string-append net-base "/etc/protocols")))
                  (substitute* "net/port_unix.go"
-- 
2.13.3

Cheers,
Alex

[0]: https://github.com/golang/go/issues/20007