05/06: tests: Expect less accurate location info in 2.2.0.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 13159c68ef912a77e5718232f6cf7a0deec4ecde
Author: Ludovic Courtès <address@hidden>
Date:   Wed Mar 15 15:08:39 2017 +0100

    tests: Expect less accurate location info in 2.2.0.
    
    * tests/guix-system.sh: Work around inaccurate location info in 2.2.0.
---
 tests/guix-system.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tests/guix-system.sh b/tests/guix-system.sh
index 77d4e28..de6db09 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='