This fixes Guile version comparisons when (version) has a
vendor-specific suffix.
Reported by Andreas Enge <andreas@enge.fr>.
* guix/utils.scm (guile-version>?): New procedure.
* tests/utils.scm ("guile-version>? 1.8", "guile-version>? 10.5"): New
  tests.
* guix/scripts/substitute-binary.scm (fetch, progress-report-port): Use
  `guile-version>?' instead of `version>?'.
* guix/http-client.scm (when-guile<=2.0.5, http-fetch): Likewise.
		
	
			
		
			
				
	
	
		
			144 lines
		
	
	
	
		
			5.1 KiB
		
	
	
	
		
			Scheme
		
	
	
	
	
	
			
		
		
	
	
			144 lines
		
	
	
	
		
			5.1 KiB
		
	
	
	
		
			Scheme
		
	
	
	
	
	
| ;;; GNU Guix --- Functional package management for GNU
 | ||
| ;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
 | ||
| ;;;
 | ||
| ;;; This file is part of GNU Guix.
 | ||
| ;;;
 | ||
| ;;; GNU Guix is free software; you can redistribute it and/or modify it
 | ||
| ;;; under the terms of the GNU General Public License as published by
 | ||
| ;;; the Free Software Foundation; either version 3 of the License, or (at
 | ||
| ;;; your option) any later version.
 | ||
| ;;;
 | ||
| ;;; GNU Guix is distributed in the hope that it will be useful, but
 | ||
| ;;; WITHOUT ANY WARRANTY; without even the implied warranty of
 | ||
| ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | ||
| ;;; GNU General Public License for more details.
 | ||
| ;;;
 | ||
| ;;; You should have received a copy of the GNU General Public License
 | ||
| ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 | ||
| 
 | ||
| (define-module (test-utils)
 | ||
|   #:use-module ((guix config) #:select (%gzip))
 | ||
|   #:use-module (guix utils)
 | ||
|   #:use-module ((guix store) #:select (%store-prefix store-path-package-name))
 | ||
|   #:use-module (srfi srfi-1)
 | ||
|   #:use-module (srfi srfi-11)
 | ||
|   #:use-module (srfi srfi-64)
 | ||
|   #:use-module (rnrs bytevectors)
 | ||
|   #:use-module (rnrs io ports)
 | ||
|   #:use-module (ice-9 match))
 | ||
| 
 | ||
| (test-begin "utils")
 | ||
| 
 | ||
| (test-assert "bytevector->base16-string->bytevector"
 | ||
|   (every (lambda (bv)
 | ||
|            (equal? (base16-string->bytevector
 | ||
|                     (bytevector->base16-string bv))
 | ||
|                    bv))
 | ||
|          (map string->utf8 '("" "f" "fo" "foo" "foob" "fooba" "foobar"))))
 | ||
| 
 | ||
| (test-assert "gnu-triplet->nix-system"
 | ||
|   (let ((samples '(("i586-gnu0.3" "i686-gnu")
 | ||
|                    ("x86_64-unknown-linux-gnu" "x86_64-linux")
 | ||
|                    ("i386-pc-linux-gnu" "i686-linux")
 | ||
|                    ("x86_64-unknown-freebsd8.2" "x86_64-freebsd")
 | ||
|                    ("x86_64-apple-darwin10.8.0" "x86_64-darwin")
 | ||
|                    ("i686-pc-cygwin" "i686-cygwin"))))
 | ||
|     (let-values (((gnu nix) (unzip2 samples)))
 | ||
|       (every (lambda (gnu nix)
 | ||
|                (equal? nix (gnu-triplet->nix-system gnu)))
 | ||
|              gnu nix))))
 | ||
| 
 | ||
| (test-assert "package-name->name+version"
 | ||
|   (every (match-lambda
 | ||
|           ((name version)
 | ||
|            (let*-values (((full-name)
 | ||
|                           (if version
 | ||
|                               (string-append name "-" version)
 | ||
|                               name))
 | ||
|                          ((name* version*)
 | ||
|                           (package-name->name+version full-name)))
 | ||
|              (and (equal? name* name)
 | ||
|                   (equal? version* version)))))
 | ||
|          '(("foo" "0.9.1b")
 | ||
|            ("foo-bar" "1.0")
 | ||
|            ("foo-bar2" #f)
 | ||
|            ("guile" "2.0.6.65-134c9") ; as produced by `git-version-gen'
 | ||
|            ("nixpkgs" "1.0pre22125_a28fe19")
 | ||
|            ("gtk2" "2.38.0"))))
 | ||
| 
 | ||
| (test-assert "guile-version>? 1.8"
 | ||
|   (guile-version>? "1.8"))
 | ||
| 
 | ||
| (test-assert "guile-version>? 10.5"
 | ||
|   (not (guile-version>? "10.5")))
 | ||
| 
 | ||
| (test-equal "string-tokenize*"
 | ||
|   '(("foo")
 | ||
|     ("foo" "bar" "baz")
 | ||
|     ("foo" "bar" "")
 | ||
|     ("foo" "bar" "baz"))
 | ||
|   (list (string-tokenize* "foo" ":")
 | ||
|         (string-tokenize* "foo;bar;baz" ";")
 | ||
|         (string-tokenize* "foo!bar!" "!")
 | ||
|         (string-tokenize* "foo+-+bar+-+baz" "+-+")))
 | ||
| 
 | ||
| (test-equal "fold2, 1 list"
 | ||
|     (list (reverse (iota 5))
 | ||
|           (map - (reverse (iota 5))))
 | ||
|   (call-with-values
 | ||
|       (lambda ()
 | ||
|         (fold2 (lambda (i r1 r2)
 | ||
|                  (values (cons i r1)
 | ||
|                          (cons (- i) r2)))
 | ||
|                '() '()
 | ||
|                (iota 5)))
 | ||
|     list))
 | ||
| 
 | ||
| (test-equal "fold2, 2 lists"
 | ||
|     (list (reverse '((a . 0) (b . 1) (c . 2) (d . 3)))
 | ||
|           (reverse '((a . 0) (b . -1) (c . -2) (d . -3))))
 | ||
|   (call-with-values
 | ||
|       (lambda ()
 | ||
|         (fold2 (lambda (k v r1 r2)
 | ||
|                  (values (alist-cons k v r1)
 | ||
|                          (alist-cons k (- v) r2)))
 | ||
|                '() '()
 | ||
|                '(a b c d)
 | ||
|                '(0 1 2 3)))
 | ||
|     list))
 | ||
| 
 | ||
| (test-assert "filtered-port, file"
 | ||
|   (let* ((file  (search-path %load-path "guix.scm"))
 | ||
|          (input (open-file file "r0b")))
 | ||
|     (let*-values (((compressed pids1)
 | ||
|                    (filtered-port `(,%gzip "-c" "--fast") input))
 | ||
|                   ((decompressed pids2)
 | ||
|                    (filtered-port `(,%gzip "-d") compressed)))
 | ||
|       (and (every (compose zero? cdr waitpid)
 | ||
|                   (append pids1 pids2))
 | ||
|            (equal? (get-bytevector-all decompressed)
 | ||
|                    (call-with-input-file file get-bytevector-all))))))
 | ||
| 
 | ||
| (test-assert "filtered-port, non-file"
 | ||
|   (let ((data (call-with-input-file (search-path %load-path "guix.scm")
 | ||
|                 get-bytevector-all)))
 | ||
|     (let*-values (((compressed pids1)
 | ||
|                    (filtered-port `(,%gzip "-c" "--fast")
 | ||
|                                   (open-bytevector-input-port data)))
 | ||
|                   ((decompressed pids2)
 | ||
|                    (filtered-port `(,%gzip "-d") compressed)))
 | ||
|       (and (pk (every (compose zero? cdr waitpid)
 | ||
|                    (append pids1 pids2)))
 | ||
|            (equal? (get-bytevector-all decompressed) data)))))
 | ||
| 
 | ||
| ;; This is actually in (guix store).
 | ||
| (test-equal "store-path-package-name"
 | ||
|   "bash-4.2-p24"
 | ||
|   (store-path-package-name
 | ||
|    (string-append (%store-prefix)
 | ||
|                   "/qvs2rj2ia5vci3wsdb7qvydrmacig4pg-bash-4.2-p24")))
 | ||
| 
 | ||
| (test-end)
 | ||
| 
 | ||
| 
 | ||
| (exit (= (test-runner-fail-count (test-runner-current)) 0))
 |