diff options
| author | Leo Famulari <leo@famulari.name> | 2017-02-18 10:04:09 -0500 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2017-02-18 10:24:07 -0500 |
| commit | f54cf6428b6b7c4ed8ca0ee3186ee58ec1167c80 (patch) | |
| tree | d37d0b0064cfcf02a2db7841159191645e9cd66c | |
| parent | 945b6721ebe4ba61396d5e618a76ae3f0199271a (diff) | |
| download | patches-f54cf6428b6b7c4ed8ca0ee3186ee58ec1167c80.tar patches-f54cf6428b6b7c4ed8ca0ee3186ee58ec1167c80.tar.gz | |
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.
| -rw-r--r-- | gnu/packages/dav.scm | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/gnu/packages/dav.scm b/gnu/packages/dav.scm index 908b336f8c..546597c617 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) |