[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: gnu: vdirsyncer: Use add-installed-pythonpath in the check phase.
From: |
Leo Famulari |
Subject: |
02/02: gnu: vdirsyncer: Use add-installed-pythonpath in the check phase. |
Date: |
Sat, 18 Feb 2017 10:24:15 -0500 (EST) |
lfam pushed a commit to branch master
in repository guix.
commit f54cf6428b6b7c4ed8ca0ee3186ee58ec1167c80
Author: Leo Famulari <address@hidden>
Date: Sat Feb 18 10:04:09 2017 -0500
gnu: vdirsyncer: Use add-installed-pythonpath in the check phase.
* gnu/packages/dav.scm (vdirsyncer)[arguments]: Move the check phase
into the normal part of the build sequence and use add-installed-pythonpath.
---
gnu/packages/dav.scm | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/dav.scm b/gnu/packages/dav.scm
index 908b336..546597c 100644
--- a/gnu/packages/dav.scm
+++ b/gnu/packages/dav.scm
@@ -67,8 +67,13 @@ clients.")
(build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
- ;; vdirsyncer requires itself to be installed in order to build
- ;; the manpage.
+ (replace 'check
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (add-installed-pythonpath inputs outputs)
+ (setenv "DETERMINISTIC_TESTS" "true")
+ (setenv "DAV_SERVER" "radicale")
+ (setenv "REMOTESTORAGE_SERVER" "skip")
+ (zero? (system* "make" "test"))))
(add-after 'install 'manpage
(lambda* (#:key inputs outputs #:allow-other-keys)
(add-installed-pythonpath inputs outputs)
@@ -77,16 +82,7 @@ clients.")
"docs/_build/man/vdirsyncer.1"
(string-append
(assoc-ref outputs "out")
- "/share/man/man1"))))
- ;; vdirsyncer requires itself to be installed in order to run the test
- ;; suite.
- (delete 'check)
- (add-after 'install 'check-later
- (lambda _
- (setenv "DETERMINISTIC_TESTS" "true")
- (setenv "DAV_SERVER" "radicale")
- (setenv "REMOTESTORAGE_SERVER" "skip")
- (zero? (system* "make" "test")))))))
+ "/share/man/man1")))))))
(native-inputs
`(("python-setuptools-scm" ,python-setuptools-scm)
("python-sphinx" ,python-sphinx)