summaryrefslogtreecommitdiffabout
path: root/tests
authorSergey Poznyakoff <gray@gnu.org>2015-11-07 15:34:53 (GMT)
committer Sergey Poznyakoff <gray@gnu.org>2015-11-07 15:34:53 (GMT)
commit6cecc808e5552f3220b97033306e42ce152908bb (patch) (side-by-side diff)
tree778eb3e631cc6e556f1ec31ab584446951da8885 /tests
parent638c48ec020909e52a2081b4b9dc6908592e1bab (diff)
downloadidest-6cecc808e5552f3220b97033306e42ce152908bb.tar.gz
idest-6cecc808e5552f3220b97033306e42ce152908bb.tar.bz2
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.
Diffstat (limited to 'tests') (more/less context) (show whitespace changes)
-rw-r--r--tests/atlocal.in3
-rw-r--r--tests/delcomm.at6
-rw-r--r--tests/fmt-shortlist.at7
-rw-r--r--tests/framelist00.at6
-rw-r--r--tests/framelist01.at6
-rw-r--r--tests/framelist02.at6
-rw-r--r--tests/list1.at7
-rw-r--r--tests/list2.at7
-rw-r--r--tests/lyrics00.at6
-rw-r--r--tests/pic00.at5
-rw-r--r--tests/pic01.at6
-rw-r--r--tests/script00.at6
-rw-r--r--tests/script01.at6
-rw-r--r--tests/script02.at6
-rw-r--r--tests/script03.at6
-rw-r--r--tests/script04.at6
-rw-r--r--tests/script05.at6
-rw-r--r--tests/script06.at6
-rw-r--r--tests/script07.at6
-rw-r--r--tests/script08.at6
-rw-r--r--tests/setlyrics.at6
-rw-r--r--tests/setpic.at6
-rw-r--r--tests/settitle.at7
-rw-r--r--tests/shortlist.at7
-rw-r--r--tests/testsuite.at7
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
@@ -12,3 +12,4 @@ 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,3 +1,3 @@
# This file is part of idest -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
@@ -20,3 +20,3 @@ AT_KEYWORDS([script examples delcomm])
AT_CHECK([
-PREREQ_GUILE
+WITH_GUILE([
genfile -f file1 -s $abs_srcdir/id3v1 10k
@@ -24,3 +24,3 @@ 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
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,3 +1,3 @@
# This file is part of idest -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
@@ -20,4 +20,3 @@ AT_KEYWORDS([script format shortlist])
AT_CHECK([
-PREREQ_GUILE
-
+WITH_GUILE([
genfile -f file1 -s $abs_srcdir/id3v1 10k
@@ -25,3 +24,3 @@ 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])
],
diff --git a/tests/framelist00.at b/tests/framelist00.at
index 894d0f0..1faaeb0 100644
--- a/tests/framelist00.at
+++ b/tests/framelist00.at
@@ -1,3 +1,3 @@
# This file is part of idest -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
@@ -20,5 +20,5 @@ 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])
],
diff --git a/tests/framelist01.at b/tests/framelist01.at
index 59e5ca2..1e37262 100644
--- a/tests/framelist01.at
+++ b/tests/framelist01.at
@@ -1,3 +1,3 @@
# This file is part of idest -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
@@ -20,5 +20,5 @@ 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])
],
diff --git a/tests/framelist02.at b/tests/framelist02.at
index c56d11e..6376ca7 100644
--- a/tests/framelist02.at
+++ b/tests/framelist02.at
@@ -1,3 +1,3 @@
# This file is part of idest -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
@@ -20,5 +20,5 @@ 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])
],
diff --git a/tests/list1.at b/tests/list1.at
index 80d869b..4464dfb 100644
--- a/tests/list1.at
+++ b/tests/list1.at
@@ -1,3 +1,3 @@
# This file is part of idest -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
@@ -20,4 +20,3 @@ AT_KEYWORDS([script examples list1])
AT_CHECK([
-PREREQ_GUILE
-
+WITH_GUILE([
genfile -f file1 -s $abs_srcdir/id3v1 10k
@@ -25,3 +24,3 @@ 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])
],
diff --git a/tests/list2.at b/tests/list2.at
index 73008c6..5bb082c 100644
--- a/tests/list2.at
+++ b/tests/list2.at
@@ -1,3 +1,3 @@
# This file is part of idest -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
@@ -20,4 +20,3 @@ AT_KEYWORDS([script examples list2])
AT_CHECK([
-PREREQ_GUILE
-
+WITH_GUILE([
genfile -f file1 -s $abs_srcdir/id3v1 10k
@@ -25,3 +24,3 @@ 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])
],
diff --git a/tests/lyrics00.at b/tests/lyrics00.at
index 0eefe05..1162398 100644
--- a/tests/lyrics00.at
+++ b/tests/lyrics00.at
@@ -1,3 +1,3 @@
# This file is part of idest -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
@@ -20,6 +20,6 @@ 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])
],
diff --git a/tests/pic00.at b/tests/pic00.at
index 1a177e3..8a97551 100644
--- a/tests/pic00.at
+++ b/tests/pic00.at
@@ -1,3 +1,3 @@
# This file is part of idest -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
@@ -20,4 +20,3 @@ 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])
],
diff --git a/tests/pic01.at b/tests/pic01.at
index 4c01c32..a264186 100644
--- a/tests/pic01.at
+++ b/tests/pic01.at
@@ -1,3 +1,3 @@
# This file is part of idest -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
@@ -20,5 +20,5 @@ 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
diff --git a/tests/script00.at b/tests/script00.at
index 402e158..92b08ee 100644
--- a/tests/script00.at
+++ b/tests/script00.at
@@ -1,3 +1,3 @@
# This file is part of idest -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
@@ -31,3 +31,3 @@ AT_DATA([framelist.scm],[
AT_CHECK([
-PREREQ_GUILE
+WITH_GUILE([
genfile -f file1 -s $abs_srcdir/id3v1 10k
@@ -35,3 +35,3 @@ genfile -f file2 -p $abs_srcdir/id3v2 10k
-idest -N -S ./framelist.scm file1 file2
+idest -N -S ./framelist.scm file1 file2])
],
diff --git a/tests/script01.at b/tests/script01.at
index e03aa41..64e185b 100644
--- a/tests/script01.at
+++ b/tests/script01.at
@@ -1,3 +1,3 @@
# This file is part of idest -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
@@ -31,3 +31,3 @@ AT_DATA([framelist.scm],[
AT_CHECK([
-PREREQ_GUILE
+WITH_GUILE([
genfile -f file1 -s $abs_srcdir/id3v1 10k
@@ -40,3 +40,3 @@ mkdir subdir
mv framelist.scm subdir
-idest -N -P `pwd`/subdir -S framelist file1 file2
+idest -N -P `pwd`/subdir -S framelist file1 file2])
],
diff --git a/tests/script02.at b/tests/script02.at
index 8eeee5c..0985f35 100644
--- a/tests/script02.at
+++ b/tests/script02.at
@@ -1,3 +1,3 @@
# This file is part of idest -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
@@ -41,5 +41,5 @@ 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|'])
],
diff --git a/tests/script03.at b/tests/script03.at
index 040d7a2..4901169 100644
--- a/tests/script03.at
+++ b/tests/script03.at
@@ -1,3 +1,3 @@
# This file is part of idest -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
@@ -28,5 +28,5 @@ 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])
],
diff --git a/tests/script04.at b/tests/script04.at
index 8c83b1f..0d6a0a7 100644
--- a/tests/script04.at
+++ b/tests/script04.at
@@ -1,3 +1,3 @@
# This file is part of idest -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
@@ -30,6 +30,6 @@ 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
diff --git a/tests/script05.at b/tests/script05.at
index eaa76c4..89ebfb1 100644
--- a/tests/script05.at
+++ b/tests/script05.at
@@ -1,3 +1,3 @@
# This file is part of idest -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
@@ -30,3 +30,3 @@ AT_DATA([delpic.scm],[
AT_CHECK([
-PREREQ_GUILE
+WITH_GUILE([
genfile -f file -p $abs_srcdir/id3v2 10k
@@ -35,3 +35,3 @@ 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
diff --git a/tests/script06.at b/tests/script06.at
index 12f00e2..233466c 100644
--- a/tests/script06.at
+++ b/tests/script06.at
@@ -1,3 +1,3 @@
# This file is part of idest -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
@@ -20,4 +20,4 @@ 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])
],
diff --git a/tests/script07.at b/tests/script07.at
index 2a5d3c7..99c9b95 100644
--- a/tests/script07.at
+++ b/tests/script07.at
@@ -1,3 +1,3 @@
# This file is part of idest -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
@@ -30,3 +30,3 @@ AT_DATA([delpic.scm],
AT_CHECK([
-PREREQ_GUILE
+WITH_GUILE([
genfile -f file -p $abs_srcdir/id3v2 10k
@@ -34,3 +34,3 @@ $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
diff --git a/tests/script08.at b/tests/script08.at
index d48e470..8ff78f7 100644
--- a/tests/script08.at
+++ b/tests/script08.at
@@ -1,3 +1,3 @@
# This file is part of idest -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
@@ -30,3 +30,3 @@ AT_DATA([delpic.scm],
AT_CHECK([
-PREREQ_GUILE
+WITH_GUILE([
genfile -f file -p $abs_srcdir/id3v2 10k
@@ -38,3 +38,3 @@ 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
diff --git a/tests/setlyrics.at b/tests/setlyrics.at
index 2b9f983..dba8090 100644
--- a/tests/setlyrics.at
+++ b/tests/setlyrics.at
@@ -1,3 +1,3 @@
# This file is part of idest -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
@@ -33,6 +33,6 @@ 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/ *$//'
diff --git a/tests/setpic.at b/tests/setpic.at
index 82642cb..e8ef343 100644
--- a/tests/setpic.at
+++ b/tests/setpic.at
@@ -1,3 +1,3 @@
# This file is part of idest -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
@@ -21,6 +21,6 @@ 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/ *$//'
diff --git a/tests/settitle.at b/tests/settitle.at
index bd71e79..7afb9db 100644
--- a/tests/settitle.at
+++ b/tests/settitle.at
@@ -1,3 +1,3 @@
# This file is part of idest -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
@@ -20,7 +20,6 @@ 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])
],
diff --git a/tests/shortlist.at b/tests/shortlist.at
index cb13aba..b4c25c2 100644
--- a/tests/shortlist.at
+++ b/tests/shortlist.at
@@ -1,3 +1,3 @@
# This file is part of idest -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
@@ -20,4 +20,3 @@ AT_KEYWORDS([script examples shortlist])
AT_CHECK([
-PREREQ_GUILE
-
+WITH_GUILE([
genfile -f file1 -s $abs_srcdir/id3v1 10k
@@ -25,3 +24,3 @@ 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])
],
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 196567d..1168a52 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -1,3 +1,3 @@
# This file is part of idest
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
#
@@ -21,2 +21,7 @@ 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
+])

Return to:

Send suggestions and report system problems to the System administrator.