* guix/build/utils.scm (wrap-program)[wrapper-file-name]
[next-wrapper-number, wrapper-target]: Remove.
[wrapped-file, already-wrapped?]: New variables.
[last-line]: New procedure.
Use it to append to PROG when a wrapper already exists.
* tests/build-utils.scm ("wrap-program, one input, multiple calls"):
Adjust the list of files to delete.
		
	
			
		
			
				
	
	
		
			125 lines
		
	
	
	
		
			4.4 KiB
		
	
	
	
		
			Scheme
		
	
	
	
	
	
			
		
		
	
	
			125 lines
		
	
	
	
		
			4.4 KiB
		
	
	
	
		
			Scheme
		
	
	
	
	
	
;;; GNU Guix --- Functional package management for GNU
 | 
						||
;;; Copyright © 2012, 2015, 2016 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-build-utils)
 | 
						||
  #:use-module (guix tests)
 | 
						||
  #:use-module (guix build utils)
 | 
						||
  #:use-module ((guix utils)
 | 
						||
                #:select (%current-system call-with-temporary-directory))
 | 
						||
  #:use-module (gnu packages)
 | 
						||
  #:use-module (gnu packages bootstrap)
 | 
						||
  #:use-module (srfi srfi-34)
 | 
						||
  #:use-module (srfi srfi-64)
 | 
						||
  #:use-module (rnrs io ports)
 | 
						||
  #:use-module (ice-9 popen))
 | 
						||
 | 
						||
 | 
						||
(test-begin "build-utils")
 | 
						||
 | 
						||
(test-equal "alist-cons-before"
 | 
						||
  '((a . 1) (x . 42) (b . 2) (c . 3))
 | 
						||
  (alist-cons-before 'b 'x 42 '((a . 1) (b . 2) (c . 3))))
 | 
						||
 | 
						||
(test-equal "alist-cons-before, reference not found"
 | 
						||
  '((a . 1) (b . 2) (c . 3) (x . 42))
 | 
						||
  (alist-cons-before 'z 'x 42 '((a . 1) (b . 2) (c . 3))))
 | 
						||
 | 
						||
(test-equal "alist-cons-after"
 | 
						||
  '((a . 1) (b . 2) (x . 42) (c . 3))
 | 
						||
  (alist-cons-after 'b 'x 42 '((a . 1) (b . 2) (c . 3))))
 | 
						||
 | 
						||
(test-equal "alist-cons-after, reference not found"
 | 
						||
  '((a . 1) (b . 2) (c . 3) (x . 42))
 | 
						||
  (alist-cons-after 'z 'x 42 '((a . 1) (b . 2) (c . 3))))
 | 
						||
 | 
						||
(test-equal "alist-replace"
 | 
						||
  '((a . 1) (b . 77) (c . 3))
 | 
						||
  (alist-replace 'b 77 '((a . 1) (b . 2) (c . 3))))
 | 
						||
 | 
						||
(test-assert "alist-replace, key not found"
 | 
						||
  (not (false-if-exception
 | 
						||
        (alist-replace 'z 77 '((a . 1) (b . 2) (c . 3))))))
 | 
						||
 | 
						||
(test-equal "fold-port-matches"
 | 
						||
  (make-list 3 "Guix")
 | 
						||
  (call-with-input-string "Guix is cool, Guix rocks, and it uses Guile, Guix!"
 | 
						||
    (lambda (port)
 | 
						||
      (fold-port-matches cons '() "Guix" port))))
 | 
						||
 | 
						||
(test-equal "fold-port-matches, trickier"
 | 
						||
  (reverse '("Guix" "guix" "Guix" "guiX" "Guix"))
 | 
						||
  (call-with-input-string "Guix, guix, GuiGuixguiX, Guix"
 | 
						||
    (lambda (port)
 | 
						||
      (fold-port-matches cons '()
 | 
						||
                         (list (char-set #\G #\g)
 | 
						||
                               (char-set #\u)
 | 
						||
                               (char-set #\i)
 | 
						||
                               (char-set #\x #\X))
 | 
						||
                         port))))
 | 
						||
 | 
						||
(test-equal "fold-port-matches, with unmatched chars"
 | 
						||
  '("Guix" #\, #\space
 | 
						||
    "guix" #\, #\space
 | 
						||
    #\G #\u #\i "Guix" "guiX" #\, #\space
 | 
						||
    "Guix")
 | 
						||
  (call-with-input-string "Guix, guix, GuiGuixguiX, Guix"
 | 
						||
    (lambda (port)
 | 
						||
      (reverse
 | 
						||
       (fold-port-matches cons '()
 | 
						||
                          (list (char-set #\G #\g)
 | 
						||
                                (char-set #\u)
 | 
						||
                                (char-set #\i)
 | 
						||
                                (char-set #\x #\X))
 | 
						||
                          port
 | 
						||
                          cons)))))
 | 
						||
 | 
						||
(test-equal "wrap-program, one input, multiple calls"
 | 
						||
  "hello world\n"
 | 
						||
  (call-with-temporary-directory
 | 
						||
   (lambda (directory)
 | 
						||
     (let ((bash (search-bootstrap-binary "bash" (%current-system)))
 | 
						||
           (foo  (string-append directory "/foo")))
 | 
						||
 | 
						||
       (call-with-output-file foo
 | 
						||
         (lambda (p)
 | 
						||
           (format p
 | 
						||
                   "#!~a~%echo \"${GUIX_FOO} ${GUIX_BAR}\"~%"
 | 
						||
                   bash)))
 | 
						||
       (chmod foo #o777)
 | 
						||
 | 
						||
       ;; wrap-program uses `which' to find bash for the wrapper shebang, but
 | 
						||
       ;; it can't know about the bootstrap bash in the store, since it's not
 | 
						||
       ;; named "bash".  Help it out a bit by providing a symlink it this
 | 
						||
       ;; package's output.
 | 
						||
       (setenv "PATH" (dirname bash))
 | 
						||
       (wrap-program foo `("GUIX_FOO" prefix ("hello")))
 | 
						||
       (wrap-program foo `("GUIX_BAR" prefix ("world")))
 | 
						||
 | 
						||
       ;; The bootstrap Bash is linked against an old libc and would abort with
 | 
						||
       ;; an assertion failure when trying to load incompatible locale data.
 | 
						||
       (unsetenv "LOCPATH")
 | 
						||
 | 
						||
       (let* ((pipe (open-input-pipe foo))
 | 
						||
              (str  (get-string-all pipe)))
 | 
						||
         (with-directory-excursion directory
 | 
						||
           (for-each delete-file '("foo" ".foo-real")))
 | 
						||
         (and (zero? (close-pipe pipe))
 | 
						||
              str))))))
 | 
						||
 | 
						||
(test-end)
 |