build-system/go: Allow providing additional test flags.

By allowing the use of test flags, we can more precisely skip failing tests
(for go version >=1.20), disable the vetting stage or select a subset of tests
(e.g. if an upstream flag is provided to skip tests which require a network
connection).  At the moment, the only way around these test failures is to
remove the test file completely or patch the code ourselves.

* guix/build-system/go.scm (go-build): Add test-flags variable.
(go-cross-build): Add test-flags variable.
* guix/build/go-build-system.scm (check): Pass the additional test flags to the invoke call.
* doc/guix.texi (go-build-system): Document <#:test-flags> parameter.

Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
Change-Id: I4015870fbbc15503cb405fe9ef6032953a5ff17f
This commit is contained in:
Troy Figiel 2024-02-25 10:06:52 +01:00 committed by Sharlatan Hellseher
parent 7f6a9ecaa3
commit 56cc37bfb2
No known key found for this signature in database
GPG key ID: 76D727BFF62CD2B5
3 changed files with 12 additions and 3 deletions

View file

@ -9582,6 +9582,12 @@ in their documentation}.
The key @code{#:go} can be used to specify the Go compiler package with
which to build the package.
The phase @code{check} provides a wrapper for @code{go test} which
builds a test binary (or multiple binaries), vets the code and then runs
the test binary. Build, test and test binary flags can be provided as
@code{#:test-flags} parameter, default is @code{'()}. See @code{go help
test} and @code{go help testflag} for more details.
@end defvar
@defvar glib-or-gtk-build-system

View file

@ -192,6 +192,7 @@ (define* (go-build name inputs
(unpack-path "")
(build-flags ''())
(tests? #t)
(test-flags ''())
(parallel-build? #t)
(parallel-tests? #t)
(allow-go-reference? #f)
@ -224,6 +225,7 @@ (define builder
#:unpack-path #$unpack-path
#:build-flags #$build-flags
#:tests? #$tests?
#:test-flags #$test-flags
#:parallel-build? #$parallel-build?
#:parallel-tests? #$parallel-tests?
#:allow-go-reference? #$allow-go-reference?
@ -248,6 +250,7 @@ (define* (go-cross-build name
(unpack-path "")
(build-flags ''())
(tests? #f) ; nothing can be done
(test-flags ''())
(allow-go-reference? #f)
(system (%current-system))
(goarch (first (go-target target)))
@ -297,6 +300,7 @@ (define %outputs
#:unpack-path #$unpack-path
#:build-flags #$build-flags
#:tests? #$tests?
#:test-flags #$test-flags
#:make-dynamic-linker-cache? #f ;cross-compiling
#:allow-go-reference? #$allow-go-reference?
#:inputs %build-inputs))))

View file

@ -278,14 +278,13 @@ (define* (build #:key import-path build-flags (parallel-build? #t)
"Here are the results of `go env`:\n"))
(invoke "go" "env"))))
;; Can this also install commands???
(define* (check #:key tests? import-path (parallel-tests? #t)
(define* (check #:key tests? import-path test-flags (parallel-tests? #t)
#:allow-other-keys)
"Run the tests for the package named by IMPORT-PATH."
(when tests?
(let* ((njobs (if parallel-tests? (parallel-job-count) 1)))
(setenv "GOMAXPROCS" (number->string njobs)))
(invoke "go" "test" import-path))
(apply invoke "go" "test" `(,import-path ,@test-flags)))
#t)
(define* (install #:key install-source? outputs import-path unpack-path #:allow-other-keys)