ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests: Add 'with-environment-variable'.

Browse source 
* tests/scripts.scm (with-environment-variable): Move to...
* guix/tests.scm (with-environment-variable): ... here.
* tests/build-utils.scm ("wrap-program, one input, multiple calls"):
Use it instead of 'setenv'.
This commit is contained in:
Ludovic Courtès 2019-03-16 15:11:29 +01:00
parent 0848615300
commit 22f95e028f
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
3 changed files with 30 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
guix/tests.scm
View file

@ -39,6 +39,8 @@ (define-module (guix tests)
canonical-file?
network-reachable?
shebang-too-long?
with-environment-variable
mock
%test-substitute-urls
test-assertm
@ -195,6 +197,19 @@ (define-syntax-rule (test-equalm name value exp)
(run-with-store store exp
#:guile-for-build (%guile-for-build)))))
(define-syntax-rule (with-environment-variable variable value body ...)
"Run BODY with VARIABLE set to VALUE."
(let ((orig (getenv variable)))
(dynamic-wind
(lambda ()
(setenv variable value))
(lambda ()
body ...)
(lambda ()
(if orig
(setenv variable orig)
(unsetenv variable))))))
;;;
;;; Narinfo files, as used by the substituter.

26
tests/build-utils.scm
View file

@ -107,19 +107,21 @@ (define-module (test-build-utils)
;; 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")))
(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")
;; 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)))))))
(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)

15
tests/scripts.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2019 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -25,19 +25,6 @@ (define-module (test-scripts)
;; Test the (guix scripts) module.
(define-syntax-rule (with-environment-variable variable value body ...)
"Run BODY with VARIABLE set to VALUE."
(let ((orig (getenv variable)))
(dynamic-wind
(lambda ()
(setenv variable value))
(lambda ()
body ...)
(lambda ()
(if orig
(setenv variable orig)
(unsetenv variable))))))
(test-begin "scripts")