From 023f866f8838df457639a38af9c2c733e445435d Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Sun, 16 Jul 2017 00:41:17 +0800 Subject: [PATCH] gnu: go@1.8: 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 ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2017 Sergei Trofimovich +;;; Copyright © 2017 Alex Vong ;;; ;;; 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