summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-01-17 17:12:44 +0100
committerLudovic Courtès <ludo@gnu.org>2020-01-17 17:12:44 +0100
commit1bb30aa35b0a7cf999c570113b5836cff46bc8fa (patch)
tree496902ff77ce62b75c8ceefc34f5d23264de7e04 /tests
parentabbb98714b455f36373c17f00c82db9d1c41d5db (diff)
downloadpatches-1bb30aa35b0a7cf999c570113b5836cff46bc8fa.tar
patches-1bb30aa35b0a7cf999c570113b5836cff46bc8fa.tar.gz
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.
Diffstat (limited to 'tests')
-rw-r--r--tests/guix-system.sh7
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/guix-system.sh b/tests/guix-system.sh
index 271627c2a5..3a831cba1d 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>.