diff options
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/golang.scm | 6 | ||||
| -rw-r--r-- | gnu/packages/patches/go-skip-gc-test.patch | 17 |
2 files changed, 21 insertions, 2 deletions
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index b12fc4b4bd..128e62beef 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Matthew Jordan <matthewjordandevops@yandex.com> ;;; Copyright © 2016 Andy Wingo <wingo@igalia.com> -;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2016, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016, 2017 Petter <petter@mykolab.ch> ;;; Copyright © 2016, 2017, 2019 Leo Famulari <leo@famulari.name> ;;; Copyright © 2017 Sergei Trofimovich <slyfox@inbox.ru> @@ -41,6 +41,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (guix build-system go) + #:use-module (gnu packages) #:use-module (gnu packages admin) #:use-module (gnu packages gcc) #:use-module (gnu packages base) @@ -408,7 +409,8 @@ in the style of communicating sequential processes (@dfn{CSP}).") name version ".src.tar.gz")) (sha256 (base32 - "04rvwj69gmw3bz8pw5pf10r21ar0pgpnswp15nkddf04dxyl9s4m")))) + "04rvwj69gmw3bz8pw5pf10r21ar0pgpnswp15nkddf04dxyl9s4m")) + (patches (search-patches "go-skip-gc-test.patch")))) (arguments (substitute-keyword-arguments (package-arguments go-1.4) ((#:phases phases) diff --git a/gnu/packages/patches/go-skip-gc-test.patch b/gnu/packages/patches/go-skip-gc-test.patch new file mode 100644 index 0000000000..2baab97580 --- /dev/null +++ b/gnu/packages/patches/go-skip-gc-test.patch @@ -0,0 +1,17 @@ +Skip a GC test known to be flaky: + + https://issues.guix.gnu.org/issue/37425 + https://github.com/golang/go/issues/27636 + +--- go/src/runtime/gc_test.go 2019-09-16 23:10:18.200680387 +0200 ++++ go/src/runtime/gc_test.go 2019-09-16 23:11:50.324360646 +0200 +@@ -27,6 +27,9 @@ func TestGcSys(t *testing.T) { + if runtime.GOOS == "linux" && runtime.GOARCH == "arm64" { + t.Skip("skipping test; GOOS=linux GOARCH=arm64 https://github.com/golang/go/issues/27636") + } ++ if runtime.GOOS == "linux" { ++ t.Skip("skipping test; GOOS=linux https://issues.guix.gnu.org/issue/37425") ++ } + got := runTestProg(t, "testprog", "GCSys") + want := "OK\n" + if got != want { |