tests: Expect less accurate location info in 2.2.0.
authorLudovic Courtès <ludo@gnu.org>
Wed, 15 Mar 2017 14:08:39 +0000 (15:08 +0100)
committerLudovic Courtès <ludo@gnu.org>
Wed, 15 Mar 2017 14:19:54 +0000 (15:19 +0100)
* tests/guix-system.sh: Work around inaccurate location info in 2.2.0.

tests/guix-system.sh

index 77d4e28..de6db09 100644 (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='