From 945b6721ebe4ba61396d5e618a76ae3f0199271a Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 18 Feb 2017 09:53:44 -0500 Subject: gnu: vdirsyncer: Don't fail the test suite when the build machine is slow. * gnu/packages/patches/vdirsyncer-test-suite-slow-machines.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/dav.scm (vdirsyncer)[source]: Use it. --- gnu/packages/dav.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/packages/dav.scm') diff --git a/gnu/packages/dav.scm b/gnu/packages/dav.scm index dd03d8964b..908b336f8c 100644 --- a/gnu/packages/dav.scm +++ b/gnu/packages/dav.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016 Leo Famulari +;;; Copyright © 2015, 2016, 2017 Leo Famulari ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,6 +21,7 @@ #:use-module (guix download) #:use-module (guix licenses) #:use-module (guix packages) + #:use-module (gnu packages) #:use-module (gnu packages python)) (define-public radicale @@ -58,6 +59,8 @@ clients.") (source (origin (method url-fetch) (uri (pypi-uri name version)) + (patches + (search-patches "vdirsyncer-test-suite-slow-machines.patch")) (sha256 (base32 "044f01fjd8dpz4y9dm3qcc1a8cihcxxbr1sz6y6fkvglpb6k85y5")))) -- cgit v1.2.3 From f54cf6428b6b7c4ed8ca0ee3186ee58ec1167c80 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 18 Feb 2017 10:04:09 -0500 Subject: 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(-) (limited to 'gnu/packages/dav.scm') 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) -- cgit v1.2.3