me
/
guix
Archived
1
0
Fork 0
Code

build-system/meson: #:test-options can be a gexp. 

* guix/build-system/meson.scm (meson-build, meson-cross-build): Accept
gexps for #:test-options.

Change-Id: I9cfec616f067a5c9928f65892e370f90f23f4352
master
Ludovic Courtès 2024-07-26 19:20:53 +02:00
parent 4bc49e2185
commit 9db34c41ac
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
guix/build-system/meson.scm
View File

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com> ;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com>
;;; Copyright © 2018, 2019 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2018, 2019 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2021, 2022 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2021-2022, 2024 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be> ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2022 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2022 Efraim Flashner <efraim@flashner.co.il>
;;; ;;;
@ -239,7 +239,9 @@ has a 'meson.build' file."
configure-flags) configure-flags)
#:build-type #$build-type #:build-type #$build-type
#:tests? #$tests? #:tests? #$tests?
#:test-options #$(sexp->gexp test-options) #:test-options #$(if (pair? test-options)
(sexp->gexp test-options)
test-options)
#:parallel-build? #$parallel-build? #:parallel-build? #$parallel-build?
#:parallel-tests? #$parallel-tests? #:parallel-tests? #$parallel-tests?
#:validate-runpath? #$validate-runpath? #:validate-runpath? #$validate-runpath?
@ -352,7 +354,9 @@ SOURCE has a 'meson.build' file."
configure-flags)) configure-flags))
#:build-type #$build-type #:build-type #$build-type
#:tests? #$tests? #:tests? #$tests?
#:test-options #$(sexp->gexp test-options) #:test-options #$(if (pair? test-options)
(sexp->gexp test-options)
test-options)
#:parallel-build? #$parallel-build? #:parallel-build? #$parallel-build?
#:parallel-tests? #$parallel-tests? #:parallel-tests? #$parallel-tests?
#:validate-runpath? #$validate-runpath? #:validate-runpath? #$validate-runpath?