From 4ed390a0e7fc468303c07d6efebc54c80b2369c5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 24 May 2017 17:08:22 +0200 Subject: [PATCH] gnu: sane-backends-minimal: Run most tests. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/scanner.scm (sane-backends-minimal)[arguments]: Add a ‘disable-failing-tests’ phase to do just that, and run the rest. --- gnu/packages/scanner.scm | 45 +++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/gnu/packages/scanner.scm b/gnu/packages/scanner.scm index ff3e37f46c..f44f037efb 100644 --- a/gnu/packages/scanner.scm +++ b/gnu/packages/scanner.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2014 John Darrington ;;; Copyright © 2015 Andy Wingo ;;; Copyright © 2016 Andy Patterson +;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -53,32 +54,34 @@ (define-public sane-backends-minimal (inputs `(("libusb-compat" ,libusb-compat))) (arguments - `(#:tests? #f - #:phases + `(#:phases (modify-phases %standard-phases (add-before 'configure 'disable-backends (lambda _ (setenv "BACKENDS" " ") #t)) - (add-after - 'install 'install-udev-rules - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (mkdir-p (string-append out "/lib/udev/rules.d")) - (copy-file "tools/udev/libsane.rules" - (string-append out - "/lib/udev/rules.d/" - "60-libsane.rules")))))))) - ;; It would seem that tests are not maintained - fails with - ;; the following: - ;; - ;; < This page was last updated on Wed Jul 31 07:52:48 2013 - ;; < by sane-desc 3.5 from sane-backends 1.0.24git - ;; --- - ;; > This page was last updated on Sun Oct 19 15:41:39 2014 - ;; > by sane-desc 3.5 from sane-backends 1.0.24 - ;; **** File generated for html-backends-split mode is different from reference - ;; Makefile:501: recipe for target 'check.local' failed + ;; Disable unmaintained tests that that fail with errors resembling: + ;; + ;; < # by sane-desc 3.5 from sane-backends 1.0.24git on Jul 31 2013 + ;; --- + ;; > # by sane-desc 3.5 from sane-backends 1.0.27 on 1970-01-01# + ;; FAIL: sane-desc -m usermap -s ./data + (add-before 'configure 'disable-failing-tests + (lambda _ + (for-each + (lambda (pattern) + (substitute* "testsuite/tools/Makefile.in" + (((string-append " " pattern " ")) " "))) + (list "usermap" "db" "udev" "udev\\+acl" "udev\\+hwdb" "hwdb")) + #t)) + (add-after 'install 'install-udev-rules + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (mkdir-p (string-append out "/lib/udev/rules.d")) + (copy-file "tools/udev/libsane.rules" + (string-append out + "/lib/udev/rules.d/" + "60-libsane.rules")))))))) (home-page "http://www.sane-project.org") (synopsis "Raster image scanner library and drivers, without scanner support")