summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-06-20 12:54:05 +0200
committerLudovic Courtès <ludo@gnu.org>2020-06-20 13:18:11 +0200
commit90f496be9ad53802fd260cac3840e7bae24a3e39 (patch)
treed1906d59cc1ee090c51d0b92d7fc250579c5166f
parentdoc: Make issues.guix.gnu.org more visible. (diff)
downloadguix-90f496be9ad53802fd260cac3840e7bae24a3e39.tar.gz
guix-90f496be9ad53802fd260cac3840e7bae24a3e39.tar.bz2
guix-90f496be9ad53802fd260cac3840e7bae24a3e39.tar.xz
tests: Actually run 'tests/guix-environment-container.sh'.
This test was skipped since the switch to Guile 3 because 'assert-container-features' would be inlined and thus accessing it with @@ would fail with an unbound-variable error. * guix/scripts/environment.scm (assert-container-features): Export. * tests/guix-environment-container.sh: Use single '@'.
-rw-r--r--guix/scripts/environment.scm3
-rw-r--r--tests/guix-environment-container.sh2
2 files changed, 3 insertions, 2 deletions
diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm
index 03f455a..d3b8b57 100644
--- a/guix/scripts/environment.scm
+++ b/guix/scripts/environment.scm
@@ -48,7 +48,8 @@
48 #:use-module (srfi srfi-26) 48 #:use-module (srfi srfi-26)
49 #:use-module (srfi srfi-37) 49 #:use-module (srfi srfi-37)
50 #:use-module (srfi srfi-98) 50 #:use-module (srfi srfi-98)
51 #:export (guix-environment)) 51 #:export (assert-container-features
52 guix-environment))
52 53
53;; Protect some env vars from purification. Borrowed from nix-shell. 54;; Protect some env vars from purification. Borrowed from nix-shell.
54(define %precious-variables 55(define %precious-variables
diff --git a/tests/guix-environment-container.sh b/tests/guix-environment-container.sh
index d313f2e..45264d4 100644
--- a/tests/guix-environment-container.sh
+++ b/tests/guix-environment-container.sh
@@ -24,7 +24,7 @@ set -e
24 24
25guix environment --version 25guix environment --version
26 26
27if ! guile -c '((@@ (guix scripts environment) assert-container-features))' 27if ! guile -c '((@ (guix scripts environment) assert-container-features))'
28then 28then
29 # User containers are not supported; skip this test. 29 # User containers are not supported; skip this test.
30 exit 77 30 exit 77