summaryrefslogtreecommitdiff
path: root/guix/build-system
diff options
context:
space:
mode:
authorAndy Patterson <ajpatter@uwaterloo.ca>2017-04-08 23:43:31 -0400
committerRicardo Wurmus <rekado@elephly.net>2017-05-16 15:18:16 +0200
commit0383afa02ae3777a0adb5304cb6918a2a5f5f250 (patch)
tree1d937ae5c82c3c6cdfba98253ed37dbdc64238bc /guix/build-system
parentf56da605d886b1f936d512c35d7057d05f284ec5 (diff)
build-system/asdf: Handle tests defined in external systems.
* 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.
Diffstat (limited to 'guix/build-system')
-rw-r--r--guix/build-system/asdf.scm4
1 files changed, 3 insertions, 1 deletions
diff --git a/guix/build-system/asdf.scm b/guix/build-system/asdf.scm
index f842fdcbc3..ec8b64497f 100644
--- a/guix/build-system/asdf.scm
+++ b/guix/build-system/asdf.scm
@@ -199,7 +199,7 @@ set up using CL source package conventions."
(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 @@ set up using CL source package conventions."
(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 @@ set up using CL source package conventions."
(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