lfam pushed a commit to branch core-updates
in repository guix.
commit eaca9ff07e4762c3d33e3090bab999c7cf74c98a
Author: Alex Vong <[email protected]>
Date: Sun Jul 16 00:41:17 2017 +0800
gnu: [email protected]: Fix test failure.
* gnu/packages/golang.scm (go-1.8)[arguments]: Escape braces in test data in
'prebuild' phase.
Signed-off-by: Leo Famulari <[email protected]>
---
gnu/packages/golang.scm | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 70cae6d..e2d1abb 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -6,6 +6,7 @@
;;; Copyright © 2016, 2017 Petter <[email protected]>
;;; Copyright © 2016, 2017 Leo Famulari <[email protected]>
;;; Copyright © 2017 Sergei Trofimovich <[email protected]>
+;;; Copyright © 2017 Alex Vong <[email protected]>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -296,6 +297,13 @@ 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. For
+ ;; more information:
+ ;; 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"
