mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-19 05:57:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

build-system/asdf: Handle tests defined in external systems.

Browse source 
* guix/build-system/asdf.scm (asdf-build): Add a #:test-asd-file argument.
[builder]: Pass it to the build system.
(package-with-build-system)[transform]: Strip it from source systems' arguments.
* guix/build/asdf-build-system.scm (check): Pass the fully qualified path to
it on to the test-system procedure.
* guix/build/lisp-utils.scm (test-system): Load the file, or otherwise one of
the often used names for it, before running the tests.  Adjust the docstring
accordingly.
This commit is contained in:
Andy Patterson 2017-04-08 23:43:31 -04:00 committed by Ricardo Wurmus
parent f56da605d8
commit 0383afa02a
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
3 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
guix/build-system/asdf.scm
View file

@ -199,7 +199,7 @@ (define (new-inputs inputs-getter)
(define base-arguments
(if target-is-source?
(strip-keyword-arguments
'(#:tests? #:asd-file #:lisp #:asd-system-name)
'(#:tests? #:asd-file #:lisp #:asd-system-name #:test-asd-file)
(package-arguments pkg))
(package-arguments pkg)))
@ -266,6 +266,7 @@ (define (asdf-build lisp-type)
(tests? #t)
(asd-file #f)
(asd-system-name #f)
(test-asd-file #f)
(phases '(@ (guix build asdf-build-system)
%standard-phases))
(search-paths '())
@ -296,6 +297,7 @@ (define builder
(source source))
#:asd-file ,(or asd-file (string-append system-name ".asd"))
#:asd-system-name ,system-name
#:test-asd-file ,test-asd-file
#:system ,system
#:tests? ,tests?
#:phases ,phases

8
guix/build/asdf-build-system.scm
View file

@ -131,12 +131,16 @@ (define* (build #:key outputs inputs asd-file asd-system-name
#t)
(define* (check #:key tests? outputs inputs asd-file asd-system-name
test-asd-file
#:allow-other-keys)
"Test the system."
(let* ((out (library-output outputs))
(asd-file (source-asd-file out asd-system-name asd-file)))
(asd-file (source-asd-file out asd-system-name asd-file))
(test-asd-file
(and=> test-asd-file
(cut source-asd-file out asd-system-name <>))))
(if tests?
(test-system asd-system-name asd-file)
(test-system asd-system-name asd-file test-asd-file)
(format #t "test suite not run~%")))
#t)

18
guix/build/lisp-utils.scm
View file

@ -184,12 +184,24 @@ (define* (generate-system-definition system
`(:lib ,(string-append system ".a"))
'())))
(define (test-system system asd-file)
"Use a lisp implementation to test SYSTEM using asdf. Load ASD-FILE first."
(define (test-system system asd-file test-asd-file)
"Use a lisp implementation to test SYSTEM using asdf. Load ASD-FILE first.
Also load TEST-ASD-FILE if necessary."
(lisp-eval-program
`((require :asdf)
(let ((*package* (find-package :asdf)))
(load ,asd-file))
(load ,asd-file)
,@(if test-asd-file
`((load ,test-asd-file))
;; Try some likely files.
(map (lambda (file)
`(when (uiop:file-exists-p ,file)
(load ,file)))
(list
(string-append system "-tests.asd")
(string-append system "-test.asd")
"tests.asd"
"test.asd"))))
(asdf:test-system ,system))))
(define (string->lisp-keyword . strings)