rekahsoft
/
guix
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tests: Expect less accurate location info in 2.2.0. 

* tests/guix-system.sh: Work around inaccurate location info in 2.2.0.
This commit is contained in:
Ludovic Courtès 2017-03-15 15:08:39 +01:00
parent a9a0227c01
commit 13159c68ef
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/guix-system.sh
View File

@ -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='