Include gnulib as a submodule. Fix testsuite.

Guile 2.x outputs spurious diagnostics to stderr when compiling input files.
The only way to disable it is to disable compilation by setting environment
variable GUILE_AUTO_COMPILE to 0.  However, even if compilation is disabled,
Guile still checks whether the compiled file exists and complains on stderr
if it is older than the input file.  This diagnostics begins with ;;;.  Delete
this using sed prior to comparing stderr with the expected text.

* .gitmodules: Add gnulib
* gnulib: New module.
* bootstrap: Update from gnulib
* gint: Upgrade.
* scheme/idest/batch/setlyrics.scm: Fix typo.
* src/Makefile.am: Use AM_CPPFLAGS instead of obsolete includes.

* tests/atlocal.in: Set GUILE_AUTO_COMPILE=0
* tests/testsuite.at (WITH_GUILE): New macro.
* tests/delcomm.at: Use WITH_GUILE.
* tests/fmt-shortlist.at: Likewise.
* tests/framelist00.at: Likewise.
* tests/framelist01.at: Likewise.
* tests/framelist02.at: Likewise.
* tests/list1.at: Likewise.
* tests/list2.at: Likewise.
* tests/lyrics00.at: Likewise.
* tests/pic00.at: Likewise.
* tests/pic01.at: Likewise.
* tests/script00.at: Likewise.
* tests/script01.at: Likewise.
* tests/script02.at: Likewise.
* tests/script03.at: Likewise.
* tests/script04.at: Likewise.
* tests/script05.at: Likewise.
* tests/script06.at: Likewise.
* tests/script07.at: Likewise.
* tests/script08.at: Likewise.
* tests/setlyrics.at: Likewise.
* tests/setpic.at: Likewise.
* tests/settitle.at: Likewise.
* tests/shortlist.at: Likewise.

25 files changed, 76 insertions, 76 deletions

diff --git a/tests/atlocal.in b/tests/atlocal.in
index a302b99..35ad063 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -10,5 +10,6 @@ trap "cleanup; test -r $XFAILFILE && cat $XFAILFILE; exit $?" 1 2 13 15
 
 GUILE_VERSION="@GUILE_VERSION@"
 INSTALL_PROG="@INSTALL@"
-
+GUILE_AUTO_COMPILE=0
+export GUILE_AUTO_COMPILE
 
diff --git a/tests/delcomm.at b/tests/delcomm.at
index f263061..236f05a 100644
--- a/tests/delcomm.at
+++ b/tests/delcomm.at
@@ -1,5 +1,5 @@
 # This file is part of idest  -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
 #
 # Idest is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,11 +18,11 @@ AT_SETUP([examples: delcomm])
 AT_KEYWORDS([script examples delcomm])
 
 AT_CHECK([
-PREREQ_GUILE
+WITH_GUILE([
 genfile -f file1 -s $abs_srcdir/id3v1 10k
 genfile -f file2 -p $abs_srcdir/id3v2 10k
 
-idest -N -S $abs_top_srcdir/examples/delcomm.scm file1 file2
+idest -N -S $abs_top_srcdir/examples/delcomm.scm file1 file2])
 echo file1
 idest -a file1
 echo file2
diff --git a/tests/fmt-shortlist.at b/tests/fmt-shortlist.at
index 925646c..d529d84 100644
--- a/tests/fmt-shortlist.at
+++ b/tests/fmt-shortlist.at
@@ -1,5 +1,5 @@
 # This file is part of idest  -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
 #
 # Idest is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,12 +18,11 @@ AT_SETUP([formats: shortlist])
 AT_KEYWORDS([script format shortlist])
 
 AT_CHECK([
-PREREQ_GUILE
-
+WITH_GUILE([
 genfile -f file1 -s $abs_srcdir/id3v1 10k
 genfile -f file2 -p $abs_srcdir/id3v2 10k
 
-idest -N -p $abs_top_srcdir/scheme --format shortlist file1 file2
+idest -N -p $abs_top_srcdir/scheme --format shortlist file1 file2])
 ],
 [0],
 [file1: File by Sergey Poznyakoff, 2011
diff --git a/tests/framelist00.at b/tests/framelist00.at
index 894d0f0..1faaeb0 100644
--- a/tests/framelist00.at
+++ b/tests/framelist00.at
@@ -1,5 +1,5 @@
 # This file is part of idest  -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
 #
 # Idest is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,9 +18,9 @@ AT_SETUP([formats: framelist --full])
 AT_KEYWORDS([script format framelist--full framelist00])
 
 AT_CHECK([
-PREREQ_GUILE
+WITH_GUILE([
 genfile -f file -p $abs_srcdir/id3v2 10k
-idest -N -p $abs_top_srcdir/scheme --format framelist --full file
+idest -N -p $abs_top_srcdir/scheme --format framelist --full file])
 ],
 [0],
 [TIT2 descr="Title/songname/content description"
diff --git a/tests/framelist01.at b/tests/framelist01.at
index 59e5ca2..1e37262 100644
--- a/tests/framelist01.at
+++ b/tests/framelist01.at
@@ -1,5 +1,5 @@
 # This file is part of idest  -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
 #
 # Idest is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,9 +18,9 @@ AT_SETUP([formats: framelist --frames])
 AT_KEYWORDS([script format framelist--frames framelist01])
 
 AT_CHECK([
-PREREQ_GUILE
+WITH_GUILE([
 genfile -f file -p $abs_srcdir/id3v2 10k
-idest -N -p $abs_top_srcdir/scheme --format framelist --frames TIT2,COMM,APIC file
+idest -N -p $abs_top_srcdir/scheme --format framelist --frames TIT2,COMM,APIC file])
 ],
 [0],
 [TIT2
diff --git a/tests/framelist02.at b/tests/framelist02.at
index c56d11e..6376ca7 100644
--- a/tests/framelist02.at
+++ b/tests/framelist02.at
@@ -1,5 +1,5 @@
 # This file is part of idest  -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
 #
 # Idest is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,9 +18,9 @@ AT_SETUP([formats: framelist --single-line])
 AT_KEYWORDS([script format framelist--single-line framelist02])
 
 AT_CHECK([
-PREREQ_GUILE
+WITH_GUILE([
 genfile -f file -p $abs_srcdir/id3v2 10k
-idest -N -p $abs_top_srcdir/scheme --format framelist --single-line file
+idest -N -p $abs_top_srcdir/scheme --format framelist --single-line file])
 ],
 [0],
 [TIT2,TALB,TRCK,COMM,TPE1,TDRC,TCON,TCOP,TENC,USLT,WPUB,WXXX,WXXX,APIC,APIC
diff --git a/tests/list1.at b/tests/list1.at
index 80d869b..4464dfb 100644
--- a/tests/list1.at
+++ b/tests/list1.at
@@ -1,5 +1,5 @@
 # This file is part of idest  -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
 #
 # Idest is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,12 +18,11 @@ AT_SETUP([examples: list1])
 AT_KEYWORDS([script examples list1])
 
 AT_CHECK([
-PREREQ_GUILE
-
+WITH_GUILE([
 genfile -f file1 -s $abs_srcdir/id3v1 10k
 genfile -f file2 -p $abs_srcdir/id3v2 10k
 
-idest -N -S $abs_top_srcdir/examples/list1.scm file1 file2
+idest -N -S $abs_top_srcdir/examples/list1.scm file1 file2])
 ],
 [0],
 [file1
diff --git a/tests/list2.at b/tests/list2.at
index 73008c6..5bb082c 100644
--- a/tests/list2.at
+++ b/tests/list2.at
@@ -1,5 +1,5 @@
 # This file is part of idest  -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
 #
 # Idest is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,12 +18,11 @@ AT_SETUP([examples: list2])
 AT_KEYWORDS([script examples list2])
 
 AT_CHECK([
-PREREQ_GUILE
-
+WITH_GUILE([
 genfile -f file1 -s $abs_srcdir/id3v1 10k
 genfile -f file2 -p $abs_srcdir/id3v2 10k
 
-idest -N -S $abs_top_srcdir/examples/list2.scm TIT2,TALB,COMM,TENC file1 file2
+idest -N -S $abs_top_srcdir/examples/list2.scm TIT2,TALB,COMM,TENC file1 file2])
 ],
 [0],
 [file1
diff --git a/tests/lyrics00.at b/tests/lyrics00.at
index 0eefe05..1162398 100644
--- a/tests/lyrics00.at
+++ b/tests/lyrics00.at
@@ -1,5 +1,5 @@
 # This file is part of idest  -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
 #
 # Idest is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,10 +18,10 @@ AT_SETUP([formats: lyrics])
 AT_KEYWORDS([script format lyrics lyrics00])
 
 AT_CHECK([
-PREREQ_GUILE
+WITH_GUILE([
 genfile -f file -p $abs_srcdir/id3v2 10k
 unset PAGER
-idest -N -p $abs_top_srcdir/scheme --format lyrics file
+idest -N -p $abs_top_srcdir/scheme --format lyrics file])
 ],
 [0],
 [File
diff --git a/tests/pic00.at b/tests/pic00.at
index 1a177e3..8a97551 100644
--- a/tests/pic00.at
+++ b/tests/pic00.at
@@ -1,5 +1,5 @@
 # This file is part of idest  -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
 #
 # Idest is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,8 +18,7 @@ AT_SETUP([formats: pic --help])
 AT_KEYWORDS([script format pic--help pic00])
 
 AT_CHECK([
-PREREQ_GUILE
-idest -N -p $abs_top_srcdir/scheme --format pic --help
+WITH_GUILE([idest -N -p $abs_top_srcdir/scheme --format pic --help])
 ],
 [0],
 [usage: idest --format=pic [[OPTIONS]] FILE...
diff --git a/tests/pic01.at b/tests/pic01.at
index 4c01c32..a264186 100644
--- a/tests/pic01.at
+++ b/tests/pic01.at
@@ -1,5 +1,5 @@
 # This file is part of idest  -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
 #
 # Idest is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,9 +18,9 @@ AT_SETUP([formats: pic --store])
 AT_KEYWORDS([script format pic--store pic01])
 
 AT_CHECK([
-PREREQ_GUILE
+WITH_GUILE([
 genfile -f file -p $abs_srcdir/id3v2 10k
-idest -N -p $abs_top_srcdir/scheme --format pic --store --file ~N-~C.~T file
+idest -N -p $abs_top_srcdir/scheme --format pic --store --file ~N-~C.~T file])
 echo file-32x32 sample image.png
 cmp "file-32x32 sample image.png" $abs_srcdir/idest-32.png
 echo file-68x68 sample image.png
diff --git a/tests/script00.at b/tests/script00.at
index 402e158..92b08ee 100644
--- a/tests/script00.at
+++ b/tests/script00.at
@@ -1,5 +1,5 @@
 # This file is part of idest  -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
 #
 # Idest is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -29,11 +29,11 @@ AT_DATA([framelist.scm],[
 ])
 
 AT_CHECK([
-PREREQ_GUILE
+WITH_GUILE([
 genfile -f file1 -s $abs_srcdir/id3v1 10k
 genfile -f file2 -p $abs_srcdir/id3v2 10k
 
-idest -N -S ./framelist.scm file1 file2
+idest -N -S ./framelist.scm file1 file2])
 ],
 [0],
 [file1
diff --git a/tests/script01.at b/tests/script01.at
index e03aa41..64e185b 100644
--- a/tests/script01.at
+++ b/tests/script01.at
@@ -1,5 +1,5 @@
 # This file is part of idest  -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
 #
 # Idest is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -29,7 +29,7 @@ AT_DATA([framelist.scm],[
 ])
 
 AT_CHECK([
-PREREQ_GUILE
+WITH_GUILE([
 genfile -f file1 -s $abs_srcdir/id3v1 10k
 genfile -f file2 -p $abs_srcdir/id3v2 10k
 
@@ -38,7 +38,7 @@ idest -N -S framelist file1 file2
 echo In subdir
 mkdir subdir
 mv framelist.scm subdir
-idest -N -P `pwd`/subdir -S framelist file1 file2
+idest -N -P `pwd`/subdir -S framelist file1 file2])
 ],
 [0],
 [In current working dir
diff --git a/tests/script02.at b/tests/script02.at
index 8eeee5c..0985f35 100644
--- a/tests/script02.at
+++ b/tests/script02.at
@@ -1,5 +1,5 @@
 # This file is part of idest  -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
 #
 # Idest is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -39,9 +39,9 @@ AT_DATA([.idest.scm],[
 ])
 
 AT_CHECK([
-PREREQ_GUILE
+WITH_GUILE([
 genfile -f file1 -s $abs_srcdir/id3v1 10k
-HOME=/tmp idest -S ./framelist.scm file1 | sed '4s|.*/idest/idest.scm|GUILE_SITE_DIR/idest/idest.scm|'
+HOME=/tmp idest -S ./framelist.scm file1 | sed '4s|.*/idest/idest.scm|GUILE_SITE_DIR/idest/idest.scm|'])
 ],
 [0],
 [Startup file .idest.scm loaded
diff --git a/tests/script03.at b/tests/script03.at
index 040d7a2..4901169 100644
--- a/tests/script03.at
+++ b/tests/script03.at
@@ -1,5 +1,5 @@
 # This file is part of idest  -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
 #
 # Idest is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -26,9 +26,9 @@ AT_DATA([test.scm],[
 ])
 
 AT_CHECK([
-PREREQ_GUILE
+WITH_GUILE([
 genfile -f file -s $abs_srcdir/id3v1 10k
-idest -N -S ./test.scm
+idest -N -S ./test.scm])
 ],
 [0],
 [file
diff --git a/tests/script04.at b/tests/script04.at
index 8c83b1f..0d6a0a7 100644
--- a/tests/script04.at
+++ b/tests/script04.at
@@ -1,5 +1,5 @@
 # This file is part of idest  -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
 #
 # Idest is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,10 +28,10 @@ AT_DATA([delpic.scm],[
 ])
 
 AT_CHECK([
-PREREQ_GUILE
+WITH_GUILE([
 genfile -f file -p $abs_srcdir/id3v2 10k
 echo removing APIC frames
-idest -N -S ./delpic.scm file
+idest -N -S ./delpic.scm file])
 echo tags
 idest -a file
 ],
diff --git a/tests/script05.at b/tests/script05.at
index eaa76c4..89ebfb1 100644
--- a/tests/script05.at
+++ b/tests/script05.at
@@ -1,5 +1,5 @@
 # This file is part of idest  -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
 #
 # Idest is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,12 +28,12 @@ AT_DATA([delpic.scm],[
 ])
 
 AT_CHECK([
-PREREQ_GUILE
+WITH_GUILE([
 genfile -f file -p $abs_srcdir/id3v2 10k
 cp file file.bak
 echo removing APIC frames
 idest -N -p $abs_top_srcdir/scheme -n -S delpic.scm file |
- sed "s|$abs_top_srcdir|abs_top_srcdir|"
+ sed "s|$abs_top_srcdir|abs_top_srcdir|"])
 echo cmp
 cmp file.bak file
 ],
diff --git a/tests/script06.at b/tests/script06.at
index 12f00e2..233466c 100644
--- a/tests/script06.at
+++ b/tests/script06.at
@@ -1,5 +1,5 @@
 # This file is part of idest  -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
 #
 # Idest is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,8 +18,8 @@ AT_SETUP([basic scripting: formats])
 AT_KEYWORDS([script format script06])
 
 AT_CHECK([
-PREREQ_GUILE
-idest -N -p $abs_top_srcdir/scheme --format framelist $abs_srcdir/id3v2
+WITH_GUILE([
+idest -N -p $abs_top_srcdir/scheme --format framelist $abs_srcdir/id3v2])
 ],
 [0],
 [TIT2
diff --git a/tests/script07.at b/tests/script07.at
index 2a5d3c7..99c9b95 100644
--- a/tests/script07.at
+++ b/tests/script07.at
@@ -1,5 +1,5 @@
 # This file is part of idest  -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
 #
 # Idest is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,11 +28,11 @@ AT_DATA([delpic.scm],
 ])  
 
 AT_CHECK([
-PREREQ_GUILE
+WITH_GUILE([
 genfile -f file -p $abs_srcdir/id3v2 10k
 $INSTALL_PROG -d scheme/idest/batch
 $INSTALL_PROG delpic.scm scheme/idest/batch
-idest -N -p $abs_top_srcdir/scheme:`pwd`/scheme --batch delpic file
+idest -N -p $abs_top_srcdir/scheme:`pwd`/scheme --batch delpic file])
 idest -a file
 ],
 [0],
diff --git a/tests/script08.at b/tests/script08.at
index d48e470..8ff78f7 100644
--- a/tests/script08.at
+++ b/tests/script08.at
@@ -1,5 +1,5 @@
 # This file is part of idest  -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
 #
 # Idest is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@ AT_DATA([delpic.scm],
 ])  
 
 AT_CHECK([
-PREREQ_GUILE
+WITH_GUILE([
 genfile -f file -p $abs_srcdir/id3v2 10k
 cp file file.bak
 $INSTALL_PROG -d scheme/idest/batch
@@ -36,7 +36,7 @@ $INSTALL_PROG delpic.scm scheme/idest/batch
 echo dry run
 subdir=`pwd`/scheme
 idest -N -p $abs_top_srcdir/scheme:$subdir -n --batch delpic file |
- sed "s|$subdir|subdir|;s|$abs_top_srcdir|abs_top_srcdir|"
+ sed "s|$subdir|subdir|;s|$abs_top_srcdir|abs_top_srcdir|"])
 echo cmp
 cmp file.bak file
 ],
diff --git a/tests/setlyrics.at b/tests/setlyrics.at
index 2b9f983..dba8090 100644
--- a/tests/setlyrics.at
+++ b/tests/setlyrics.at
@@ -1,5 +1,5 @@
 # This file is part of idest  -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
 #
 # Idest is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -31,10 +31,10 @@ manipulating ID3 tags and to apply them to any number of files.
 ])
 
 AT_CHECK([
-PREREQ_GUILE
+WITH_GUILE([
 genfile -f file  10k
 idest -N -p $abs_top_srcdir/scheme --batch \
-  setlyrics --lang eng -c 'sample lyrics' -f input file
+  setlyrics --lang eng -c 'sample lyrics' -f input file])
 idest -a file | sed 's/ *$//'
 ],
 [0],
diff --git a/tests/setpic.at b/tests/setpic.at
index 82642cb..e8ef343 100644
--- a/tests/setpic.at
+++ b/tests/setpic.at
@@ -1,5 +1,5 @@
 # This file is part of idest  -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
 #
 # Idest is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,10 +19,10 @@ AT_KEYWORDS([script batch setpic])
 
 
 AT_CHECK([
-PREREQ_GUILE
+WITH_GUILE([
 genfile -f file 10k
 idest -N -p $abs_top_srcdir/scheme --batch \
-  setpic -d '32x32 picture' -f $abs_srcdir/idest-32.png file
+  setpic -d '32x32 picture' -f $abs_srcdir/idest-32.png file])
 idest -a file | sed 's/ *$//'
 ],
 [0],
diff --git a/tests/settitle.at b/tests/settitle.at
index bd71e79..7afb9db 100644
--- a/tests/settitle.at
+++ b/tests/settitle.at
@@ -1,5 +1,5 @@
 # This file is part of idest  -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
 #
 # Idest is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,11 +18,10 @@ AT_SETUP([examples: settitle])
 AT_KEYWORDS([script examples settitle])
 
 AT_CHECK([
-PREREQ_GUILE
-
+WITH_GUILE([
 genfile -f Test_file_for_idest.mp3 10k
 idest -N -S $abs_top_srcdir/examples/settitle.scm Test_file_for_idest.mp3
-idest -a Test_file_for_idest.mp3
+idest -a Test_file_for_idest.mp3])
 ],
 [0],
 [TIT2: Test file for idest
diff --git a/tests/shortlist.at b/tests/shortlist.at
index cb13aba..b4c25c2 100644
--- a/tests/shortlist.at
+++ b/tests/shortlist.at
@@ -1,5 +1,5 @@
 # This file is part of idest  -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
 #
 # Idest is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,12 +18,11 @@ AT_SETUP([examples: shortlist])
 AT_KEYWORDS([script examples shortlist])
 
 AT_CHECK([
-PREREQ_GUILE
-
+WITH_GUILE([
 genfile -f file1 -s $abs_srcdir/id3v1 10k
 genfile -f file2 -p $abs_srcdir/id3v2 10k
 
-idest -N -S $abs_top_srcdir/examples/shortlist.scm file1 file2
+idest -N -S $abs_top_srcdir/examples/shortlist.scm file1 file2])
 ],
 [0],
 [file1: File by Sergey Poznyakoff, 2011
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 196567d..1168a52 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -1,5 +1,5 @@
 # This file is part of idest
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
 #
 # Idest is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,6 +19,11 @@ m4_version_prereq([2.52g])
 m4_define([AT_SKIP_TEST],[exit 77])
 
 m4_define([PREREQ_GUILE],[test -z "$GUILE_VERSION" && AT_SKIP_TEST])
+m4_define([WITH_GUILE],[PREREQ_GUILE
+($1) 2>stderr.log
+sed '/^;;; /d' stderr.log >&2
+rm stderr.log
+])
 
 dnl # Begin tests