aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-03-15 15:08:39 +0100
committerLudovic Courtès <ludo@gnu.org>2017-03-15 15:19:54 +0100
commit13159c68ef912a77e5718232f6cf7a0deec4ecde (patch)
tree4df1be8b69f4e02436191521a30384c79bcc75fd /tests
parenta9a0227c0127e1813190a7664f7ad858e791480d (diff)
downloadguix-13159c68ef912a77e5718232f6cf7a0deec4ecde.tar
guix-13159c68ef912a77e5718232f6cf7a0deec4ecde.tar.gz
tests: Expect less accurate location info in 2.2.0.
* tests/guix-system.sh: Work around inaccurate location info in 2.2.0.
Diffstat (limited to 'tests')
-rw-r--r--tests/guix-system.sh9
1 files changed, 8 insertions, 1 deletions
diff --git a/tests/guix-system.sh b/tests/guix-system.sh
index 77d4e28999..de6db0928c 100644
--- a/tests/guix-system.sh
+++ b/tests/guix-system.sh
@@ -76,7 +76,14 @@ EOF
if guix system build "$tmpfile" -n 2> "$errorfile"
then false
else
- grep "$tmpfile:9:.*[Uu]nbound variable.*GRUB-config" "$errorfile"
+ if 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>.
+ grep "$tmpfile:[49]:.*[Uu]nbound variable.*GRUB-config" "$errorfile"
+ else
+ grep "$tmpfile:9:.*[Uu]nbound variable.*GRUB-config" "$errorfile"
+ fi
fi
OS_BASE='