[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/04: tests: Actually run 'tests/guix-environment-container.sh'.
From: |
guix-commits |
Subject: |
02/04: tests: Actually run 'tests/guix-environment-container.sh'. |
Date: |
Sat, 20 Jun 2020 07:18:37 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 90f496be9ad53802fd260cac3840e7bae24a3e39
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sat Jun 20 12:54:05 2020 +0200
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 '@'.
---
guix/scripts/environment.scm | 3 ++-
tests/guix-environment-container.sh | 2 +-
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 @@
#:use-module (srfi srfi-26)
#:use-module (srfi srfi-37)
#:use-module (srfi srfi-98)
- #:export (guix-environment))
+ #:export (assert-container-features
+ guix-environment))
;; Protect some env vars from purification. Borrowed from nix-shell.
(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
guix environment --version
-if ! guile -c '((@@ (guix scripts environment) assert-container-features))'
+if ! guile -c '((@ (guix scripts environment) assert-container-features))'
then
# User containers are not supported; skip this test.
exit 77