2013-01-06 00:47:50 +01:00
|
|
|
|
;;; GNU Guix --- Functional package management for GNU
|
2020-11-16 11:03:19 +01:00
|
|
|
|
;;; Copyright © 2012, 2015, 2016, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
|
2018-01-02 21:43:07 +01:00
|
|
|
|
;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
|
2021-01-07 21:15:24 +01:00
|
|
|
|
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
utils: Define ‘search-input-file’ procedure.
The procedure ‘which’ from (guix build utils)
is used for two different purposes:
1. for finding the absolute file name of a binary
that needs to run during the build process
2. for finding the absolute file name of a binary,
for the target system (as in --target=TARGET),
e.g. for substituting sh->/gnu/store/.../bin/sh,
python->/gnu/store/.../bin/python.
When compiling natively (target=#f in Guix parlance),
this is perfectly fine.
However, when cross-compiling, there is a problem.
"which" looks in $PATH for binaries. That's good for purpose (1),
but incorrect for (2), as the $PATH contains binaries from native-inputs
instead of inputs.
This commit defines a ‘search-input-file’ procedure. It functions
like 'which', but instead of searching in $PATH, it searches in
the 'inputs' of the build phase, which must be passed to
‘search-input-file’ as an argument. Also, the file name must
include "bin/" or "sbin/" as appropriate.
* guix/build/utils.scm (search-input-file): New procedure.
* tests/build-utils.scm
("search-input-file: exception if not found")
("search-input-file: can find if existent"): Test it.
* doc/guix.texi (File Search): Document it.
Partially-Fixes: <https://issues.guix.gnu.org/47869>
Co-Authored-By: Ludovic Courtès <ludo@gnu.org>
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2021-05-31 18:36:09 +02:00
|
|
|
|
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
|
2021-04-29 12:33:08 +02:00
|
|
|
|
;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
|
2012-07-01 17:32:03 +02:00
|
|
|
|
;;;
|
2013-01-06 00:47:50 +01:00
|
|
|
|
;;; This file is part of GNU Guix.
|
2012-07-01 17:32:03 +02:00
|
|
|
|
;;;
|
2013-01-06 00:47:50 +01:00
|
|
|
|
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
2012-07-01 17:32:03 +02:00
|
|
|
|
;;; 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.
|
|
|
|
|
;;;
|
2013-01-06 00:47:50 +01:00
|
|
|
|
;;; GNU Guix is distributed in the hope that it will be useful, but
|
2012-07-01 17:32:03 +02:00
|
|
|
|
;;; 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
|
2013-01-06 00:47:50 +01:00
|
|
|
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
2012-07-01 17:32:03 +02:00
|
|
|
|
|
|
|
|
|
|
2021-01-07 21:15:24 +01:00
|
|
|
|
(define-module (test build-utils)
|
2014-09-13 08:05:03 +02:00
|
|
|
|
#:use-module (guix tests)
|
2012-07-01 17:32:03 +02:00
|
|
|
|
#:use-module (guix build utils)
|
2016-09-02 10:22:13 +02:00
|
|
|
|
#:use-module ((guix utils)
|
|
|
|
|
#:select (%current-system call-with-temporary-directory))
|
2014-09-13 08:05:03 +02:00
|
|
|
|
#:use-module (gnu packages)
|
|
|
|
|
#:use-module (gnu packages bootstrap)
|
|
|
|
|
#:use-module (srfi srfi-34)
|
2019-03-16 17:07:57 +01:00
|
|
|
|
#:use-module (srfi srfi-35)
|
2014-09-13 08:05:03 +02:00
|
|
|
|
#:use-module (srfi srfi-64)
|
|
|
|
|
#:use-module (rnrs io ports)
|
|
|
|
|
#:use-module (ice-9 popen))
|
2012-07-01 17:32:03 +02:00
|
|
|
|
|
2014-09-13 08:05:03 +02:00
|
|
|
|
|
2012-07-01 17:32:03 +02:00
|
|
|
|
(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))))))
|
|
|
|
|
|
2012-10-16 23:01:01 +02:00
|
|
|
|
(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)))))
|
|
|
|
|
|
2016-09-02 10:22:13 +02:00
|
|
|
|
(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.
|
2019-03-16 15:11:29 +01:00
|
|
|
|
(with-environment-variable "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)))))))
|
|
|
|
|
|
2019-03-16 17:07:57 +01:00
|
|
|
|
(test-assert "invoke/quiet, success"
|
|
|
|
|
(begin
|
|
|
|
|
(invoke/quiet "true")
|
|
|
|
|
#t))
|
|
|
|
|
|
|
|
|
|
(test-assert "invoke/quiet, failure"
|
|
|
|
|
(guard (c ((message-condition? c)
|
|
|
|
|
(string-contains (condition-message c) "This is an error.")))
|
|
|
|
|
(invoke/quiet "sh" "-c" "echo This is an error. ; false")
|
|
|
|
|
#f))
|
|
|
|
|
|
|
|
|
|
(test-assert "invoke/quiet, failure, message on stderr"
|
|
|
|
|
(guard (c ((message-condition? c)
|
|
|
|
|
(string-contains (condition-message c)
|
|
|
|
|
"This is another error.")))
|
|
|
|
|
(invoke/quiet "sh" "-c" "echo This is another error. >&2 ; false")
|
|
|
|
|
#f))
|
2014-09-13 08:05:03 +02:00
|
|
|
|
|
2018-01-02 21:43:07 +01:00
|
|
|
|
(let ((script-contents "\
|
|
|
|
|
#!/anything/cabbage-bash-1.2.3/bin/sh
|
|
|
|
|
|
|
|
|
|
echo hello world"))
|
|
|
|
|
|
|
|
|
|
(test-equal "wrap-script, simple case"
|
|
|
|
|
(string-append
|
|
|
|
|
(format #f "\
|
2019-11-24 20:48:11 +01:00
|
|
|
|
#!~a --no-auto-compile
|
2018-01-02 21:43:07 +01:00
|
|
|
|
#!#; Guix wrapper
|
|
|
|
|
#\\-~s
|
|
|
|
|
#\\-~s
|
|
|
|
|
"
|
2019-11-24 20:48:11 +01:00
|
|
|
|
(which "guile")
|
2018-01-02 21:43:07 +01:00
|
|
|
|
'(begin (let ((current (getenv "GUIX_FOO")))
|
|
|
|
|
(setenv "GUIX_FOO"
|
|
|
|
|
(if current
|
|
|
|
|
(string-append "/some/path:/some/other/path"
|
|
|
|
|
":" current)
|
|
|
|
|
"/some/path:/some/other/path"))))
|
|
|
|
|
'(let ((cl (command-line)))
|
|
|
|
|
(apply execl "/anything/cabbage-bash-1.2.3/bin/sh"
|
2021-04-29 12:33:08 +02:00
|
|
|
|
(car cl) (append (quote ()) cl))))
|
2018-01-02 21:43:07 +01:00
|
|
|
|
script-contents)
|
|
|
|
|
(call-with-temporary-directory
|
|
|
|
|
(lambda (directory)
|
|
|
|
|
(let ((script-file-name (string-append directory "/foo")))
|
|
|
|
|
(call-with-output-file script-file-name
|
|
|
|
|
(lambda (port)
|
2020-11-16 11:03:19 +01:00
|
|
|
|
(display script-contents port)))
|
2018-01-02 21:43:07 +01:00
|
|
|
|
(chmod script-file-name #o777)
|
2019-11-24 20:48:11 +01:00
|
|
|
|
(wrap-script script-file-name
|
|
|
|
|
`("GUIX_FOO" prefix ("/some/path"
|
|
|
|
|
"/some/other/path")))
|
2018-01-02 21:43:07 +01:00
|
|
|
|
(let ((str (call-with-input-file script-file-name get-string-all)))
|
|
|
|
|
(with-directory-excursion directory
|
|
|
|
|
(delete-file "foo"))
|
|
|
|
|
str))))))
|
|
|
|
|
|
|
|
|
|
(let ((script-contents "\
|
|
|
|
|
#!/anything/cabbage-bash-1.2.3/bin/python3 -and -args
|
|
|
|
|
# vim:fileencoding=utf-8
|
|
|
|
|
print('hello world')"))
|
|
|
|
|
|
|
|
|
|
(test-equal "wrap-script, with encoding declaration"
|
|
|
|
|
(string-append
|
|
|
|
|
(format #f "\
|
|
|
|
|
#!MYGUILE --no-auto-compile
|
|
|
|
|
#!#; # vim:fileencoding=utf-8
|
|
|
|
|
#\\-~s
|
|
|
|
|
#\\-~s
|
|
|
|
|
"
|
|
|
|
|
'(begin (let ((current (getenv "GUIX_FOO")))
|
|
|
|
|
(setenv "GUIX_FOO"
|
|
|
|
|
(if current
|
|
|
|
|
(string-append "/some/path:/some/other/path"
|
|
|
|
|
":" current)
|
|
|
|
|
"/some/path:/some/other/path"))))
|
|
|
|
|
`(let ((cl (command-line)))
|
|
|
|
|
(apply execl "/anything/cabbage-bash-1.2.3/bin/python3"
|
|
|
|
|
(car cl)
|
2021-04-29 12:33:08 +02:00
|
|
|
|
(append '("-and" "-args") cl))))
|
2018-01-02 21:43:07 +01:00
|
|
|
|
script-contents)
|
|
|
|
|
(call-with-temporary-directory
|
|
|
|
|
(lambda (directory)
|
|
|
|
|
(let ((script-file-name (string-append directory "/foo")))
|
|
|
|
|
(call-with-output-file script-file-name
|
|
|
|
|
(lambda (port)
|
|
|
|
|
(format port script-contents)))
|
|
|
|
|
(chmod script-file-name #o777)
|
|
|
|
|
|
|
|
|
|
(wrap-script script-file-name
|
|
|
|
|
#:guile "MYGUILE"
|
|
|
|
|
`("GUIX_FOO" prefix ("/some/path"
|
|
|
|
|
"/some/other/path")))
|
|
|
|
|
(let ((str (call-with-input-file script-file-name get-string-all)))
|
|
|
|
|
(with-directory-excursion directory
|
|
|
|
|
(delete-file "foo"))
|
|
|
|
|
str))))))
|
|
|
|
|
|
|
|
|
|
(test-assert "wrap-script, raises condition"
|
|
|
|
|
(call-with-temporary-directory
|
|
|
|
|
(lambda (directory)
|
|
|
|
|
(let ((script-file-name (string-append directory "/foo")))
|
|
|
|
|
(call-with-output-file script-file-name
|
|
|
|
|
(lambda (port)
|
|
|
|
|
(format port "This is not a script")))
|
|
|
|
|
(chmod script-file-name #o777)
|
2019-11-24 20:47:20 +01:00
|
|
|
|
(guard (c ((wrap-error? c) #t))
|
|
|
|
|
(wrap-script script-file-name
|
|
|
|
|
#:guile "MYGUILE"
|
|
|
|
|
`("GUIX_FOO" prefix ("/some/path"
|
|
|
|
|
"/some/other/path")))
|
|
|
|
|
#f)))))
|
2018-01-02 21:43:07 +01:00
|
|
|
|
|
2021-04-29 12:33:08 +02:00
|
|
|
|
(define (arg-test bash-args)
|
|
|
|
|
(call-with-temporary-directory
|
|
|
|
|
(lambda (directory)
|
|
|
|
|
(let ((script-file-name (string-append directory "/bash-test.sh")))
|
|
|
|
|
(call-with-output-file script-file-name
|
|
|
|
|
(lambda (port)
|
|
|
|
|
(display (string-append "\
|
|
|
|
|
#!" (which "bash") bash-args "
|
|
|
|
|
echo \"$#$0$*${A}\"")
|
|
|
|
|
port)))
|
|
|
|
|
|
|
|
|
|
(display "Unwrapped script contents:\n")
|
|
|
|
|
(call-with-input-file script-file-name
|
|
|
|
|
(lambda (port) (display (get-string-all port))))
|
|
|
|
|
(newline) (newline)
|
|
|
|
|
(chmod script-file-name #o777)
|
|
|
|
|
(setenv "A" "A")
|
|
|
|
|
(let* ((run-script (lambda _
|
|
|
|
|
(open-pipe*
|
|
|
|
|
OPEN_READ
|
|
|
|
|
script-file-name "1" "2" "3 3" "4")))
|
|
|
|
|
(pipe (run-script))
|
|
|
|
|
(unwrapped-output (get-string-all pipe)))
|
|
|
|
|
(close-pipe pipe)
|
|
|
|
|
|
|
|
|
|
(wrap-script script-file-name `("A" = ("A\nA")))
|
|
|
|
|
|
|
|
|
|
(display "Wrapped script contents:\n")
|
|
|
|
|
(call-with-input-file script-file-name
|
|
|
|
|
(lambda (port) (display (get-string-all port))))
|
|
|
|
|
(newline) (newline)
|
|
|
|
|
|
|
|
|
|
(let* ((pipe (run-script))
|
|
|
|
|
(wrapped-output (get-string-all pipe)))
|
|
|
|
|
(close-pipe pipe)
|
|
|
|
|
(display "./bash-test.sh 1 2 3\\ 3 4 # Output:\n")
|
|
|
|
|
(display unwrapped-output) (newline)
|
|
|
|
|
(display "./bash-test.sh 1 2 3\\ 3 4 # Output (wrapped):\n")
|
|
|
|
|
(display wrapped-output) (newline)
|
|
|
|
|
(string=? (string-append unwrapped-output "A\n")
|
|
|
|
|
wrapped-output)))))))
|
|
|
|
|
|
|
|
|
|
(test-assert "wrap-script, argument handling"
|
|
|
|
|
(arg-test ""))
|
|
|
|
|
|
|
|
|
|
(test-assert "wrap-script, argument handling, bash --norc"
|
|
|
|
|
(arg-test " --norc"))
|
|
|
|
|
|
2021-01-07 21:15:24 +01:00
|
|
|
|
(test-equal "substitute*, text contains a NUL byte, UTF-8"
|
|
|
|
|
"c\0d"
|
|
|
|
|
(with-fluids ((%default-port-encoding "UTF-8")
|
|
|
|
|
(%default-port-conversion-strategy 'error))
|
|
|
|
|
;; The GNU libc is locale sensitive. Depending on the value of LANG, the
|
|
|
|
|
;; test could fail with "string contains #\\nul character: ~S" or "cannot
|
|
|
|
|
;; convert wide string to output locale".
|
|
|
|
|
(setlocale LC_ALL "en_US.UTF-8")
|
|
|
|
|
(call-with-temporary-output-file
|
|
|
|
|
(lambda (file port)
|
|
|
|
|
(format port "a\0b")
|
|
|
|
|
(flush-output-port port)
|
|
|
|
|
|
|
|
|
|
(substitute* file
|
|
|
|
|
(("a") "c")
|
|
|
|
|
(("b") "d"))
|
|
|
|
|
|
|
|
|
|
(with-input-from-file file
|
|
|
|
|
(lambda _
|
|
|
|
|
(get-string-all (current-input-port))))))))
|
|
|
|
|
|
utils: Define ‘search-input-file’ procedure.
The procedure ‘which’ from (guix build utils)
is used for two different purposes:
1. for finding the absolute file name of a binary
that needs to run during the build process
2. for finding the absolute file name of a binary,
for the target system (as in --target=TARGET),
e.g. for substituting sh->/gnu/store/.../bin/sh,
python->/gnu/store/.../bin/python.
When compiling natively (target=#f in Guix parlance),
this is perfectly fine.
However, when cross-compiling, there is a problem.
"which" looks in $PATH for binaries. That's good for purpose (1),
but incorrect for (2), as the $PATH contains binaries from native-inputs
instead of inputs.
This commit defines a ‘search-input-file’ procedure. It functions
like 'which', but instead of searching in $PATH, it searches in
the 'inputs' of the build phase, which must be passed to
‘search-input-file’ as an argument. Also, the file name must
include "bin/" or "sbin/" as appropriate.
* guix/build/utils.scm (search-input-file): New procedure.
* tests/build-utils.scm
("search-input-file: exception if not found")
("search-input-file: can find if existent"): Test it.
* doc/guix.texi (File Search): Document it.
Partially-Fixes: <https://issues.guix.gnu.org/47869>
Co-Authored-By: Ludovic Courtès <ludo@gnu.org>
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2021-05-31 18:36:09 +02:00
|
|
|
|
(test-equal "search-input-file: exception if not found"
|
|
|
|
|
`((path)
|
|
|
|
|
(file . "does-not-exist"))
|
|
|
|
|
(guard (e ((search-error? e)
|
|
|
|
|
`((path . ,(search-error-path e))
|
|
|
|
|
(file . ,(search-error-file e)))))
|
|
|
|
|
(search-input-file '() "does-not-exist")))
|
|
|
|
|
|
|
|
|
|
(test-equal "search-input-file: can find if existent"
|
|
|
|
|
(which "guile")
|
|
|
|
|
(search-input-file
|
|
|
|
|
`(("guile/bin" . ,(dirname (which "guile"))))
|
|
|
|
|
"guile"))
|
|
|
|
|
|
|
|
|
|
(test-equal "search-input-file: can search in multiple directories"
|
|
|
|
|
(which "guile")
|
|
|
|
|
(call-with-temporary-directory
|
|
|
|
|
(lambda (directory)
|
|
|
|
|
(search-input-file
|
|
|
|
|
`(("irrelevant" . ,directory)
|
|
|
|
|
("guile/bin" . ,(dirname (which "guile"))))
|
|
|
|
|
"guile"))))
|
|
|
|
|
|
2012-07-01 17:32:03 +02:00
|
|
|
|
(test-end)
|