[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/06: guix system: Add workaround in test for Guile 3.0.0.
From: |
guix-commits |
Subject: |
03/06: guix system: Add workaround in test for Guile 3.0.0. |
Date: |
Fri, 17 Jan 2020 11:33:34 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 1bb30aa35b0a7cf999c570113b5836cff46bc8fa
Author: Ludovic Courtès <address@hidden>
AuthorDate: Fri Jan 17 17:12:44 2020 +0100
guix system: Add workaround in test for Guile 3.0.0.
* tests/guix-system.sh: For the 'GRUB-config' test, add workaround for
the reported line number in Guile 3.0.0.
---
tests/guix-system.sh | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/tests/guix-system.sh b/tests/guix-system.sh
index 271627c..3a831cb 100644
--- a/tests/guix-system.sh
+++ b/tests/guix-system.sh
@@ -120,7 +120,12 @@ EOF
if guix system build "$tmpfile" -n 2> "$errorfile"
then false
else
- if test "`guile -c '(display (effective-version))'`" = 2.2
+ if test "`guile -c '(display (effective-version))'`" = 3.0
+ then
+ # FIXME: With Guile 3.3.0 the error is reported on line 11.
+ # See <https://bugs.gnu.org/38388>.
+ grep "$tmpfile:[0-9]\+:[0-9]\+:.*GRUB-config.*[Uu]nbound variable"
"$errorfile"
+ elif test "`guile -c '(display (effective-version))'`" = 2.2
then
# FIXME: With Guile 2.2.0 the error is reported on line 4.
# See <http://bugs.gnu.org/26107>.
- branch master updated (05f8a14 -> 50299ad), guix-commits, 2020/01/17
- 02/06: ui: Ignore 'raise-exception' frames when reporting exceptions., guix-commits, 2020/01/17
- 01/06: git-authenticate: Adjust atheia's key info., guix-commits, 2020/01/17
- 03/06: guix system: Add workaround in test for Guile 3.0.0.,
guix-commits <=
- 05/06: guix-install.sh: Create an init profile during installation, guix-commits, 2020/01/17
- 06/06: doc: Add booting instructions for Libreboot., guix-commits, 2020/01/17
- 04/06: build: Allow builds with Guile 3.0., guix-commits, 2020/01/17