[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
77/244: gnu: go-1.17: Fix test suite on powerpc64le-linux.
From: |
guix-commits |
Subject: |
77/244: gnu: go-1.17: Fix test suite on powerpc64le-linux. |
Date: |
Wed, 12 Apr 2023 08:47:23 -0400 (EDT) |
apteryx pushed a commit to branch staging
in repository guix.
commit 4c229df532b3cd1015cc63aba451920ff740acbb
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Wed Apr 5 15:53:38 2023 +0300
gnu: go-1.17: Fix test suite on powerpc64le-linux.
* gnu/packages/golang.scm (go-1.17)[arguments]: Use custom
'patch-gcc:lib phase on powerpc64le-linux. Add a phase to adjust the
allowed size of an executable in the test suite.
[inputs]: Keep gcc:lib as an input on powerpc64le-linux.
(go-1.18)[arguments]: Delete custom 'adjust-test-suite phase.
---
gnu/packages/golang.scm | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 31022eb1d5..89f2192274 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -700,7 +700,7 @@ in the style of communicating sequential processes
(@dfn{CSP}).")
(substitute* "src/time/zoneinfo_unix.go"
(("/usr/share/zoneinfo/") tzdata-path)))))
;; Keep this synchronized with the package inputs.
- ,@(if (target-arm?)
+ ,@(if (or (target-arm?) (target-ppc64le?))
'((add-after 'unpack 'patch-gcc:lib
(lambda* (#:key inputs #:allow-other-keys)
(let* ((gcclib (string-append (assoc-ref inputs "gcc:lib")
"/lib")))
@@ -722,6 +722,13 @@ in the style of communicating sequential processes
(@dfn{CSP}).")
"ldflags = append(ldflags, \"-r\")\n"
"ldflags = append(ldflags, \"" gcclib "\")\n")))))))
'())
+ ;; Backported from later versions of go to workaround 64k page sizes.
+ ,@(if (target-ppc64le?)
+ '((add-after 'unpack 'adjust-test-suite
+ (lambda _
+ (substitute* "misc/cgo/testshared/shared_test.go"
+ (("100000") "256000")))))
+ '())
(add-after 'patch-source 'disable-failing-tests
(lambda _
;; Disable failing tests: these tests attempt to access
@@ -833,7 +840,7 @@ in the style of communicating sequential processes
(@dfn{CSP}).")
(install-file file (string-append out "/share/doc/go")))
'("AUTHORS" "CONTRIBUTORS" "CONTRIBUTING.md" "PATENTS"
"README.md" "SECURITY.md"))))))))
- (inputs (if (not (target-arm?))
+ (inputs (if (not (or (target-arm?) (target-ppc64le?)))
(alist-delete "gcc:lib" (package-inputs go-1.16))
(package-inputs go-1.16)))))
@@ -856,6 +863,7 @@ in the style of communicating sequential processes
(@dfn{CSP}).")
(substitute-keyword-arguments (package-arguments go-1.17)
((#:phases phases)
`(modify-phases ,phases
+ (delete 'adjust-test-suite)
;; See the platforms using this phase in go-1.17.
(replace 'patch-gcc:lib
(lambda* (#:key inputs #:allow-other-keys)
- 48/244: gnu: python-debian: Update to 0.1.49., (continued)
- 48/244: gnu: python-debian: Update to 0.1.49., guix-commits, 2023/04/12
- 49/244: gnu: python-boolean.py: Update to 4.0., guix-commits, 2023/04/12
- 52/244: gnu: emacs-eat: Update to 0.7., guix-commits, 2023/04/12
- 56/244: gnu: mixxx: Update to 2.3.4., guix-commits, 2023/04/12
- 57/244: gnu: pre-commit: Update to 3.2.2., guix-commits, 2023/04/12
- 63/244: gnu: kdenlive: Update to 22.12.3., guix-commits, 2023/04/12
- 70/244: gnu: Add r-targets., guix-commits, 2023/04/12
- 95/244: gnu: r-ellipse: Update to 0.4.5., guix-commits, 2023/04/12
- 82/244: gnu: linux-libre 5.10: Update to 5.10.177., guix-commits, 2023/04/12
- 75/244: gnu: emacs-tintin-mode: Appease linter., guix-commits, 2023/04/12
- 77/244: gnu: go-1.17: Fix test suite on powerpc64le-linux.,
guix-commits <=
- 98/244: gnu: r-glmmtmb: Update to 1.1.7., guix-commits, 2023/04/12
- 99/244: gnu: r-ggeffects: Update to 1.2.1., guix-commits, 2023/04/12
- 106/244: gnu: r-topicmodels: Update to 0.2-14., guix-commits, 2023/04/12
- 105/244: gnu: r-emplik: Update to 1.3., guix-commits, 2023/04/12
- 110/244: gnu: r-dials: Update to 1.2.0., guix-commits, 2023/04/12
- 114/244: gnu: r-ggh4x: Update to 0.2.4., guix-commits, 2023/04/12
- 116/244: gnu: r-gstat: Update to 2.1-1., guix-commits, 2023/04/12
- 118/244: gnu: r-matrix: Update to 1.5-4., guix-commits, 2023/04/12
- 112/244: gnu: r-densestbayes: Update to 1.0-2.2., guix-commits, 2023/04/12
- 122/244: gnu: r-sn: Update to 2.1.1., guix-commits, 2023/04/12