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) (unidiff)
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
@@ -7,8 +7,9 @@ PATH=@abs_top_builddir@/src:$PATH
7XFAILFILE=$abs_builddir/.badversion 7XFAILFILE=$abs_builddir/.badversion
8 8
9trap "cleanup; test -r $XFAILFILE && cat $XFAILFILE; exit $?" 1 2 13 15 9trap "cleanup; test -r $XFAILFILE && cat $XFAILFILE; exit $?" 1 2 13 15
10 10
11GUILE_VERSION="@GUILE_VERSION@" 11GUILE_VERSION="@GUILE_VERSION@"
12INSTALL_PROG="@INSTALL@" 12INSTALL_PROG="@INSTALL@"
13 13GUILE_AUTO_COMPILE=0
14export GUILE_AUTO_COMPILE
14 15
diff --git a/tests/delcomm.at b/tests/delcomm.at
index f263061..236f05a 100644
--- a/tests/delcomm.at
+++ b/tests/delcomm.at
@@ -1,8 +1,8 @@
1# This file is part of idest -*- autotest -*- 1# This file is part of idest -*- autotest -*-
2# Copyright (C) 2011 Sergey Poznyakoff 2# Copyright (C) 2011, 2015 Sergey Poznyakoff
3# 3#
4# Idest is free software; you can redistribute it and/or modify 4# Idest is free software; you can redistribute it and/or modify
5# it under the terms of the GNU General Public License as published by 5# it under the terms of the GNU General Public License as published by
6# the Free Software Foundation; either version 3, or (at your option) 6# the Free Software Foundation; either version 3, or (at your option)
7# any later version. 7# any later version.
8# 8#
@@ -15,17 +15,17 @@
15# along with idest. If not, see <http://www.gnu.org/licenses/>. 15# along with idest. If not, see <http://www.gnu.org/licenses/>.
16 16
17AT_SETUP([examples: delcomm]) 17AT_SETUP([examples: delcomm])
18AT_KEYWORDS([script examples delcomm]) 18AT_KEYWORDS([script examples delcomm])
19 19
20AT_CHECK([ 20AT_CHECK([
21PREREQ_GUILE 21WITH_GUILE([
22genfile -f file1 -s $abs_srcdir/id3v1 10k 22genfile -f file1 -s $abs_srcdir/id3v1 10k
23genfile -f file2 -p $abs_srcdir/id3v2 10k 23genfile -f file2 -p $abs_srcdir/id3v2 10k
24 24
25idest -N -S $abs_top_srcdir/examples/delcomm.scm file1 file2 25idest -N -S $abs_top_srcdir/examples/delcomm.scm file1 file2])
26echo file1 26echo file1
27idest -a file1 27idest -a file1
28echo file2 28echo file2
29idest -a file2 29idest -a file2
30], 30],
31[0], 31[0],
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,8 +1,8 @@
1# This file is part of idest -*- autotest -*- 1# This file is part of idest -*- autotest -*-
2# Copyright (C) 2011 Sergey Poznyakoff 2# Copyright (C) 2011, 2015 Sergey Poznyakoff
3# 3#
4# Idest is free software; you can redistribute it and/or modify 4# Idest is free software; you can redistribute it and/or modify
5# it under the terms of the GNU General Public License as published by 5# it under the terms of the GNU General Public License as published by
6# the Free Software Foundation; either version 3, or (at your option) 6# the Free Software Foundation; either version 3, or (at your option)
7# any later version. 7# any later version.
8# 8#
@@ -15,18 +15,17 @@
15# along with idest. If not, see <http://www.gnu.org/licenses/>. 15# along with idest. If not, see <http://www.gnu.org/licenses/>.
16 16
17AT_SETUP([formats: shortlist]) 17AT_SETUP([formats: shortlist])
18AT_KEYWORDS([script format shortlist]) 18AT_KEYWORDS([script format shortlist])
19 19
20AT_CHECK([ 20AT_CHECK([
21PREREQ_GUILE 21WITH_GUILE([
22
23genfile -f file1 -s $abs_srcdir/id3v1 10k 22genfile -f file1 -s $abs_srcdir/id3v1 10k
24genfile -f file2 -p $abs_srcdir/id3v2 10k 23genfile -f file2 -p $abs_srcdir/id3v2 10k
25 24
26idest -N -p $abs_top_srcdir/scheme --format shortlist file1 file2 25idest -N -p $abs_top_srcdir/scheme --format shortlist file1 file2])
27], 26],
28[0], 27[0],
29[file1: File by Sergey Poznyakoff, 2011 28[file1: File by Sergey Poznyakoff, 2011
30file2: File by Sergey Poznyakoff, 2011 29file2: File by Sergey Poznyakoff, 2011
31]) 30])
32 31
diff --git a/tests/framelist00.at b/tests/framelist00.at
index 894d0f0..1faaeb0 100644
--- a/tests/framelist00.at
+++ b/tests/framelist00.at
@@ -1,8 +1,8 @@
1# This file is part of idest -*- autotest -*- 1# This file is part of idest -*- autotest -*-
2# Copyright (C) 2011 Sergey Poznyakoff 2# Copyright (C) 2011, 2015 Sergey Poznyakoff
3# 3#
4# Idest is free software; you can redistribute it and/or modify 4# Idest is free software; you can redistribute it and/or modify
5# it under the terms of the GNU General Public License as published by 5# it under the terms of the GNU General Public License as published by
6# the Free Software Foundation; either version 3, or (at your option) 6# the Free Software Foundation; either version 3, or (at your option)
7# any later version. 7# any later version.
8# 8#
@@ -15,15 +15,15 @@
15# along with idest. If not, see <http://www.gnu.org/licenses/>. 15# along with idest. If not, see <http://www.gnu.org/licenses/>.
16 16
17AT_SETUP([formats: framelist --full]) 17AT_SETUP([formats: framelist --full])
18AT_KEYWORDS([script format framelist--full framelist00]) 18AT_KEYWORDS([script format framelist--full framelist00])
19 19
20AT_CHECK([ 20AT_CHECK([
21PREREQ_GUILE 21WITH_GUILE([
22genfile -f file -p $abs_srcdir/id3v2 10k 22genfile -f file -p $abs_srcdir/id3v2 10k
23idest -N -p $abs_top_srcdir/scheme --format framelist --full file 23idest -N -p $abs_top_srcdir/scheme --format framelist --full file])
24], 24],
25[0], 25[0],
26[TIT2 descr="Title/songname/content description" 26[TIT2 descr="Title/songname/content description"
27TALB descr="Album/movie/show title" 27TALB descr="Album/movie/show title"
28TRCK descr="Track number/position in set" 28TRCK descr="Track number/position in set"
29COMM descr="Comments" lang="eng" condesc="" 29COMM descr="Comments" lang="eng" condesc=""
diff --git a/tests/framelist01.at b/tests/framelist01.at
index 59e5ca2..1e37262 100644
--- a/tests/framelist01.at
+++ b/tests/framelist01.at
@@ -1,8 +1,8 @@
1# This file is part of idest -*- autotest -*- 1# This file is part of idest -*- autotest -*-
2# Copyright (C) 2011 Sergey Poznyakoff 2# Copyright (C) 2011, 2015 Sergey Poznyakoff
3# 3#
4# Idest is free software; you can redistribute it and/or modify 4# Idest is free software; you can redistribute it and/or modify
5# it under the terms of the GNU General Public License as published by 5# it under the terms of the GNU General Public License as published by
6# the Free Software Foundation; either version 3, or (at your option) 6# the Free Software Foundation; either version 3, or (at your option)
7# any later version. 7# any later version.
8# 8#
@@ -15,15 +15,15 @@
15# along with idest. If not, see <http://www.gnu.org/licenses/>. 15# along with idest. If not, see <http://www.gnu.org/licenses/>.
16 16
17AT_SETUP([formats: framelist --frames]) 17AT_SETUP([formats: framelist --frames])
18AT_KEYWORDS([script format framelist--frames framelist01]) 18AT_KEYWORDS([script format framelist--frames framelist01])
19 19
20AT_CHECK([ 20AT_CHECK([
21PREREQ_GUILE 21WITH_GUILE([
22genfile -f file -p $abs_srcdir/id3v2 10k 22genfile -f file -p $abs_srcdir/id3v2 10k
23idest -N -p $abs_top_srcdir/scheme --format framelist --frames TIT2,COMM,APIC file 23idest -N -p $abs_top_srcdir/scheme --format framelist --frames TIT2,COMM,APIC file])
24], 24],
25[0], 25[0],
26[TIT2 26[TIT2
27COMM 27COMM
28APIC 28APIC
29APIC 29APIC
diff --git a/tests/framelist02.at b/tests/framelist02.at
index c56d11e..6376ca7 100644
--- a/tests/framelist02.at
+++ b/tests/framelist02.at
@@ -1,8 +1,8 @@
1# This file is part of idest -*- autotest -*- 1# This file is part of idest -*- autotest -*-
2# Copyright (C) 2011 Sergey Poznyakoff 2# Copyright (C) 2011, 2015 Sergey Poznyakoff
3# 3#
4# Idest is free software; you can redistribute it and/or modify 4# Idest is free software; you can redistribute it and/or modify
5# it under the terms of the GNU General Public License as published by 5# it under the terms of the GNU General Public License as published by
6# the Free Software Foundation; either version 3, or (at your option) 6# the Free Software Foundation; either version 3, or (at your option)
7# any later version. 7# any later version.
8# 8#
@@ -15,15 +15,15 @@
15# along with idest. If not, see <http://www.gnu.org/licenses/>. 15# along with idest. If not, see <http://www.gnu.org/licenses/>.
16 16
17AT_SETUP([formats: framelist --single-line]) 17AT_SETUP([formats: framelist --single-line])
18AT_KEYWORDS([script format framelist--single-line framelist02]) 18AT_KEYWORDS([script format framelist--single-line framelist02])
19 19
20AT_CHECK([ 20AT_CHECK([
21PREREQ_GUILE 21WITH_GUILE([
22genfile -f file -p $abs_srcdir/id3v2 10k 22genfile -f file -p $abs_srcdir/id3v2 10k
23idest -N -p $abs_top_srcdir/scheme --format framelist --single-line file 23idest -N -p $abs_top_srcdir/scheme --format framelist --single-line file])
24], 24],
25[0], 25[0],
26[TIT2,TALB,TRCK,COMM,TPE1,TDRC,TCON,TCOP,TENC,USLT,WPUB,WXXX,WXXX,APIC,APIC 26[TIT2,TALB,TRCK,COMM,TPE1,TDRC,TCON,TCOP,TENC,USLT,WPUB,WXXX,WXXX,APIC,APIC
27]) 27])
28 28
29AT_CLEANUP 29AT_CLEANUP
diff --git a/tests/list1.at b/tests/list1.at
index 80d869b..4464dfb 100644
--- a/tests/list1.at
+++ b/tests/list1.at
@@ -1,8 +1,8 @@
1# This file is part of idest -*- autotest -*- 1# This file is part of idest -*- autotest -*-
2# Copyright (C) 2011 Sergey Poznyakoff 2# Copyright (C) 2011, 2015 Sergey Poznyakoff
3# 3#
4# Idest is free software; you can redistribute it and/or modify 4# Idest is free software; you can redistribute it and/or modify
5# it under the terms of the GNU General Public License as published by 5# it under the terms of the GNU General Public License as published by
6# the Free Software Foundation; either version 3, or (at your option) 6# the Free Software Foundation; either version 3, or (at your option)
7# any later version. 7# any later version.
8# 8#
@@ -15,18 +15,17 @@
15# along with idest. If not, see <http://www.gnu.org/licenses/>. 15# along with idest. If not, see <http://www.gnu.org/licenses/>.
16 16
17AT_SETUP([examples: list1]) 17AT_SETUP([examples: list1])
18AT_KEYWORDS([script examples list1]) 18AT_KEYWORDS([script examples list1])
19 19
20AT_CHECK([ 20AT_CHECK([
21PREREQ_GUILE 21WITH_GUILE([
22
23genfile -f file1 -s $abs_srcdir/id3v1 10k 22genfile -f file1 -s $abs_srcdir/id3v1 10k
24genfile -f file2 -p $abs_srcdir/id3v2 10k 23genfile -f file2 -p $abs_srcdir/id3v2 10k
25 24
26idest -N -S $abs_top_srcdir/examples/list1.scm file1 file2 25idest -N -S $abs_top_srcdir/examples/list1.scm file1 file2])
27], 26],
28[0], 27[0],
29[file1 28[file1
30(TIT2 (descr . Title/songname/content description) (text . File)) 29(TIT2 (descr . Title/songname/content description) (text . File))
31(TPE1 (descr . Lead performer(s)/soloist(s)) (text . Sergey Poznyakoff)) 30(TPE1 (descr . Lead performer(s)/soloist(s)) (text . Sergey Poznyakoff))
32(TALB (descr . Album/movie/show title) (text . Idest Test Suite)) 31(TALB (descr . Album/movie/show title) (text . Idest Test Suite))
diff --git a/tests/list2.at b/tests/list2.at
index 73008c6..5bb082c 100644
--- a/tests/list2.at
+++ b/tests/list2.at
@@ -1,8 +1,8 @@
1# This file is part of idest -*- autotest -*- 1# This file is part of idest -*- autotest -*-
2# Copyright (C) 2011 Sergey Poznyakoff 2# Copyright (C) 2011, 2015 Sergey Poznyakoff
3# 3#
4# Idest is free software; you can redistribute it and/or modify 4# Idest is free software; you can redistribute it and/or modify
5# it under the terms of the GNU General Public License as published by 5# it under the terms of the GNU General Public License as published by
6# the Free Software Foundation; either version 3, or (at your option) 6# the Free Software Foundation; either version 3, or (at your option)
7# any later version. 7# any later version.
8# 8#
@@ -15,18 +15,17 @@
15# along with idest. If not, see <http://www.gnu.org/licenses/>. 15# along with idest. If not, see <http://www.gnu.org/licenses/>.
16 16
17AT_SETUP([examples: list2]) 17AT_SETUP([examples: list2])
18AT_KEYWORDS([script examples list2]) 18AT_KEYWORDS([script examples list2])
19 19
20AT_CHECK([ 20AT_CHECK([
21PREREQ_GUILE 21WITH_GUILE([
22
23genfile -f file1 -s $abs_srcdir/id3v1 10k 22genfile -f file1 -s $abs_srcdir/id3v1 10k
24genfile -f file2 -p $abs_srcdir/id3v2 10k 23genfile -f file2 -p $abs_srcdir/id3v2 10k
25 24
26idest -N -S $abs_top_srcdir/examples/list2.scm TIT2,TALB,COMM,TENC file1 file2 25idest -N -S $abs_top_srcdir/examples/list2.scm TIT2,TALB,COMM,TENC file1 file2])
27], 26],
28[0], 27[0],
29[file1 28[file1
30(TIT2 (descr . Title/songname/content description) (text . File)) 29(TIT2 (descr . Title/songname/content description) (text . File))
31(TALB (descr . Album/movie/show title) (text . Idest Test Suite)) 30(TALB (descr . Album/movie/show title) (text . Idest Test Suite))
32(COMM (descr . Comments) (text . Sample ID3 headers for idest) (lang . XXX) (condesc . )) 31(COMM (descr . Comments) (text . Sample ID3 headers for idest) (lang . XXX) (condesc . ))
diff --git a/tests/lyrics00.at b/tests/lyrics00.at
index 0eefe05..1162398 100644
--- a/tests/lyrics00.at
+++ b/tests/lyrics00.at
@@ -1,8 +1,8 @@
1# This file is part of idest -*- autotest -*- 1# This file is part of idest -*- autotest -*-
2# Copyright (C) 2011 Sergey Poznyakoff 2# Copyright (C) 2011, 2015 Sergey Poznyakoff
3# 3#
4# Idest is free software; you can redistribute it and/or modify 4# Idest is free software; you can redistribute it and/or modify
5# it under the terms of the GNU General Public License as published by 5# it under the terms of the GNU General Public License as published by
6# the Free Software Foundation; either version 3, or (at your option) 6# the Free Software Foundation; either version 3, or (at your option)
7# any later version. 7# any later version.
8# 8#
@@ -15,16 +15,16 @@
15# along with idest. If not, see <http://www.gnu.org/licenses/>. 15# along with idest. If not, see <http://www.gnu.org/licenses/>.
16 16
17AT_SETUP([formats: lyrics]) 17AT_SETUP([formats: lyrics])
18AT_KEYWORDS([script format lyrics lyrics00]) 18AT_KEYWORDS([script format lyrics lyrics00])
19 19
20AT_CHECK([ 20AT_CHECK([
21PREREQ_GUILE 21WITH_GUILE([
22genfile -f file -p $abs_srcdir/id3v2 10k 22genfile -f file -p $abs_srcdir/id3v2 10k
23unset PAGER 23unset PAGER
24idest -N -p $abs_top_srcdir/scheme --format lyrics file 24idest -N -p $abs_top_srcdir/scheme --format lyrics file])
25], 25],
26[0], 26[0],
27[File 27[File
28 28
29IdEst is an ID3 Edit and Scripting Tool, a command line utility for 29IdEst is an ID3 Edit and Scripting Tool, a command line utility for
30manipulating ID3 tags. ID3 tag is a metadata container which supplies 30manipulating ID3 tags. ID3 tag is a metadata container which supplies
diff --git a/tests/pic00.at b/tests/pic00.at
index 1a177e3..8a97551 100644
--- a/tests/pic00.at
+++ b/tests/pic00.at
@@ -1,8 +1,8 @@
1# This file is part of idest -*- autotest -*- 1# This file is part of idest -*- autotest -*-
2# Copyright (C) 2011 Sergey Poznyakoff 2# Copyright (C) 2011, 2015 Sergey Poznyakoff
3# 3#
4# Idest is free software; you can redistribute it and/or modify 4# Idest is free software; you can redistribute it and/or modify
5# it under the terms of the GNU General Public License as published by 5# it under the terms of the GNU General Public License as published by
6# the Free Software Foundation; either version 3, or (at your option) 6# the Free Software Foundation; either version 3, or (at your option)
7# any later version. 7# any later version.
8# 8#
@@ -15,14 +15,13 @@
15# along with idest. If not, see <http://www.gnu.org/licenses/>. 15# along with idest. If not, see <http://www.gnu.org/licenses/>.
16 16
17AT_SETUP([formats: pic --help]) 17AT_SETUP([formats: pic --help])
18AT_KEYWORDS([script format pic--help pic00]) 18AT_KEYWORDS([script format pic--help pic00])
19 19
20AT_CHECK([ 20AT_CHECK([
21PREREQ_GUILE 21WITH_GUILE([idest -N -p $abs_top_srcdir/scheme --format pic --help])
22idest -N -p $abs_top_srcdir/scheme --format pic --help
23], 22],
24[0], 23[0],
25[usage: idest --format=pic [[OPTIONS]] FILE... 24[usage: idest --format=pic [[OPTIONS]] FILE...
26displays attached picture(s) or stores them on disc 25displays attached picture(s) or stores them on disc
27OPTIONS are: 26OPTIONS are:
28 -v, --viewer PROG use PROG to view images (default: xv) 27 -v, --viewer PROG use PROG to view images (default: xv)
diff --git a/tests/pic01.at b/tests/pic01.at
index 4c01c32..a264186 100644
--- a/tests/pic01.at
+++ b/tests/pic01.at
@@ -1,8 +1,8 @@
1# This file is part of idest -*- autotest -*- 1# This file is part of idest -*- autotest -*-
2# Copyright (C) 2011 Sergey Poznyakoff 2# Copyright (C) 2011, 2015 Sergey Poznyakoff
3# 3#
4# Idest is free software; you can redistribute it and/or modify 4# Idest is free software; you can redistribute it and/or modify
5# it under the terms of the GNU General Public License as published by 5# it under the terms of the GNU General Public License as published by
6# the Free Software Foundation; either version 3, or (at your option) 6# the Free Software Foundation; either version 3, or (at your option)
7# any later version. 7# any later version.
8# 8#
@@ -15,15 +15,15 @@
15# along with idest. If not, see <http://www.gnu.org/licenses/>. 15# along with idest. If not, see <http://www.gnu.org/licenses/>.
16 16
17AT_SETUP([formats: pic --store]) 17AT_SETUP([formats: pic --store])
18AT_KEYWORDS([script format pic--store pic01]) 18AT_KEYWORDS([script format pic--store pic01])
19 19
20AT_CHECK([ 20AT_CHECK([
21PREREQ_GUILE 21WITH_GUILE([
22genfile -f file -p $abs_srcdir/id3v2 10k 22genfile -f file -p $abs_srcdir/id3v2 10k
23idest -N -p $abs_top_srcdir/scheme --format pic --store --file ~N-~C.~T file 23idest -N -p $abs_top_srcdir/scheme --format pic --store --file ~N-~C.~T file])
24echo file-32x32 sample image.png 24echo file-32x32 sample image.png
25cmp "file-32x32 sample image.png" $abs_srcdir/idest-32.png 25cmp "file-32x32 sample image.png" $abs_srcdir/idest-32.png
26echo file-68x68 sample image.png 26echo file-68x68 sample image.png
27cmp "file-68x68 sample image.png" $abs_srcdir/idest-68.png 27cmp "file-68x68 sample image.png" $abs_srcdir/idest-68.png
28], 28],
29[0], 29[0],
diff --git a/tests/script00.at b/tests/script00.at
index 402e158..92b08ee 100644
--- a/tests/script00.at
+++ b/tests/script00.at
@@ -1,8 +1,8 @@
1# This file is part of idest -*- autotest -*- 1# This file is part of idest -*- autotest -*-
2# Copyright (C) 2011 Sergey Poznyakoff 2# Copyright (C) 2011, 2015 Sergey Poznyakoff
3# 3#
4# Idest is free software; you can redistribute it and/or modify 4# Idest is free software; you can redistribute it and/or modify
5# it under the terms of the GNU General Public License as published by 5# it under the terms of the GNU General Public License as published by
6# the Free Software Foundation; either version 3, or (at your option) 6# the Free Software Foundation; either version 3, or (at your option)
7# any later version. 7# any later version.
8# 8#
@@ -26,17 +26,17 @@ AT_DATA([framelist.scm],[
26 (display frame) 26 (display frame)
27 (newline)) 27 (newline))
28 frames)) 28 frames))
29]) 29])
30 30
31AT_CHECK([ 31AT_CHECK([
32PREREQ_GUILE 32WITH_GUILE([
33genfile -f file1 -s $abs_srcdir/id3v1 10k 33genfile -f file1 -s $abs_srcdir/id3v1 10k
34genfile -f file2 -p $abs_srcdir/id3v2 10k 34genfile -f file2 -p $abs_srcdir/id3v2 10k
35 35
36idest -N -S ./framelist.scm file1 file2 36idest -N -S ./framelist.scm file1 file2])
37], 37],
38[0], 38[0],
39[file1 39[file1
40(TIT2 (descr . Title/songname/content description) (text . File)) 40(TIT2 (descr . Title/songname/content description) (text . File))
41(TPE1 (descr . Lead performer(s)/soloist(s)) (text . Sergey Poznyakoff)) 41(TPE1 (descr . Lead performer(s)/soloist(s)) (text . Sergey Poznyakoff))
42(TALB (descr . Album/movie/show title) (text . Idest Test Suite)) 42(TALB (descr . Album/movie/show title) (text . Idest Test Suite))
diff --git a/tests/script01.at b/tests/script01.at
index e03aa41..64e185b 100644
--- a/tests/script01.at
+++ b/tests/script01.at
@@ -1,8 +1,8 @@
1# This file is part of idest -*- autotest -*- 1# This file is part of idest -*- autotest -*-
2# Copyright (C) 2011 Sergey Poznyakoff 2# Copyright (C) 2011, 2015 Sergey Poznyakoff
3# 3#
4# Idest is free software; you can redistribute it and/or modify 4# Idest is free software; you can redistribute it and/or modify
5# it under the terms of the GNU General Public License as published by 5# it under the terms of the GNU General Public License as published by
6# the Free Software Foundation; either version 3, or (at your option) 6# the Free Software Foundation; either version 3, or (at your option)
7# any later version. 7# any later version.
8# 8#
@@ -26,22 +26,22 @@ AT_DATA([framelist.scm],[
26 (display frame) 26 (display frame)
27 (newline)) 27 (newline))
28 frames)) 28 frames))
29]) 29])
30 30
31AT_CHECK([ 31AT_CHECK([
32PREREQ_GUILE 32WITH_GUILE([
33genfile -f file1 -s $abs_srcdir/id3v1 10k 33genfile -f file1 -s $abs_srcdir/id3v1 10k
34genfile -f file2 -p $abs_srcdir/id3v2 10k 34genfile -f file2 -p $abs_srcdir/id3v2 10k
35 35
36echo In current working dir 36echo In current working dir
37idest -N -S framelist file1 file2 37idest -N -S framelist file1 file2
38echo In subdir 38echo In subdir
39mkdir subdir 39mkdir subdir
40mv framelist.scm subdir 40mv framelist.scm subdir
41idest -N -P `pwd`/subdir -S framelist file1 file2 41idest -N -P `pwd`/subdir -S framelist file1 file2])
42], 42],
43[0], 43[0],
44[In current working dir 44[In current working dir
45file1 45file1
46(TIT2 (descr . Title/songname/content description) (text . File)) 46(TIT2 (descr . Title/songname/content description) (text . File))
47(TPE1 (descr . Lead performer(s)/soloist(s)) (text . Sergey Poznyakoff)) 47(TPE1 (descr . Lead performer(s)/soloist(s)) (text . Sergey Poznyakoff))
diff --git a/tests/script02.at b/tests/script02.at
index 8eeee5c..0985f35 100644
--- a/tests/script02.at
+++ b/tests/script02.at
@@ -1,8 +1,8 @@
1# This file is part of idest -*- autotest -*- 1# This file is part of idest -*- autotest -*-
2# Copyright (C) 2011 Sergey Poznyakoff 2# Copyright (C) 2011, 2015 Sergey Poznyakoff
3# 3#
4# Idest is free software; you can redistribute it and/or modify 4# Idest is free software; you can redistribute it and/or modify
5# it under the terms of the GNU General Public License as published by 5# it under the terms of the GNU General Public License as published by
6# the Free Software Foundation; either version 3, or (at your option) 6# the Free Software Foundation; either version 3, or (at your option)
7# any later version. 7# any later version.
8# 8#
@@ -36,15 +36,15 @@ AT_DATA([.idest.scm],[
36 (display dir) 36 (display dir)
37 (newline)) 37 (newline))
38 (command-line)) 38 (command-line))
39]) 39])
40 40
41AT_CHECK([ 41AT_CHECK([
42PREREQ_GUILE 42WITH_GUILE([
43genfile -f file1 -s $abs_srcdir/id3v1 10k 43genfile -f file1 -s $abs_srcdir/id3v1 10k
44HOME=/tmp idest -S ./framelist.scm file1 | sed '4s|.*/idest/idest.scm|GUILE_SITE_DIR/idest/idest.scm|' 44HOME=/tmp idest -S ./framelist.scm file1 | sed '4s|.*/idest/idest.scm|GUILE_SITE_DIR/idest/idest.scm|'])
45], 45],
46[0], 46[0],
47[Startup file .idest.scm loaded 47[Startup file .idest.scm loaded
48.idest.scm 48.idest.scm
49/tmp/.idest.scm 49/tmp/.idest.scm
50GUILE_SITE_DIR/idest/idest.scm 50GUILE_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,8 +1,8 @@
1# This file is part of idest -*- autotest -*- 1# This file is part of idest -*- autotest -*-
2# Copyright (C) 2011 Sergey Poznyakoff 2# Copyright (C) 2011, 2015 Sergey Poznyakoff
3# 3#
4# Idest is free software; you can redistribute it and/or modify 4# Idest is free software; you can redistribute it and/or modify
5# it under the terms of the GNU General Public License as published by 5# it under the terms of the GNU General Public License as published by
6# the Free Software Foundation; either version 3, or (at your option) 6# the Free Software Foundation; either version 3, or (at your option)
7# any later version. 7# any later version.
8# 8#
@@ -23,15 +23,15 @@ AT_DATA([test.scm],[
23 (newline)) 23 (newline))
24 24
25(set-program-arguments (append (command-line) (list "file"))) 25(set-program-arguments (append (command-line) (list "file")))
26]) 26])
27 27
28AT_CHECK([ 28AT_CHECK([
29PREREQ_GUILE 29WITH_GUILE([
30genfile -f file -s $abs_srcdir/id3v1 10k 30genfile -f file -s $abs_srcdir/id3v1 10k
31idest -N -S ./test.scm 31idest -N -S ./test.scm])
32], 32],
33[0], 33[0],
34[file 34[file
35]) 35])
36 36
37AT_CLEANUP 37AT_CLEANUP
diff --git a/tests/script04.at b/tests/script04.at
index 8c83b1f..0d6a0a7 100644
--- a/tests/script04.at
+++ b/tests/script04.at
@@ -1,8 +1,8 @@
1# This file is part of idest -*- autotest -*- 1# This file is part of idest -*- autotest -*-
2# Copyright (C) 2011 Sergey Poznyakoff 2# Copyright (C) 2011, 2015 Sergey Poznyakoff
3# 3#
4# Idest is free software; you can redistribute it and/or modify 4# Idest is free software; you can redistribute it and/or modify
5# it under the terms of the GNU General Public License as published by 5# it under the terms of the GNU General Public License as published by
6# the Free Software Foundation; either version 3, or (at your option) 6# the Free Software Foundation; either version 3, or (at your option)
7# any later version. 7# any later version.
8# 8#
@@ -25,16 +25,16 @@ AT_DATA([delpic.scm],[
25 frames)) 25 frames))
26 26
27(set! idest-readonly #f) 27(set! idest-readonly #f)
28]) 28])
29 29
30AT_CHECK([ 30AT_CHECK([
31PREREQ_GUILE 31WITH_GUILE([
32genfile -f file -p $abs_srcdir/id3v2 10k 32genfile -f file -p $abs_srcdir/id3v2 10k
33echo removing APIC frames 33echo removing APIC frames
34idest -N -S ./delpic.scm file 34idest -N -S ./delpic.scm file])
35echo tags 35echo tags
36idest -a file 36idest -a file
37], 37],
38[0], 38[0],
39[removing APIC frames 39[removing APIC frames
40tags 40tags
diff --git a/tests/script05.at b/tests/script05.at
index eaa76c4..89ebfb1 100644
--- a/tests/script05.at
+++ b/tests/script05.at
@@ -1,8 +1,8 @@
1# This file is part of idest -*- autotest -*- 1# This file is part of idest -*- autotest -*-
2# Copyright (C) 2011 Sergey Poznyakoff 2# Copyright (C) 2011, 2015 Sergey Poznyakoff
3# 3#
4# Idest is free software; you can redistribute it and/or modify 4# Idest is free software; you can redistribute it and/or modify
5# it under the terms of the GNU General Public License as published by 5# it under the terms of the GNU General Public License as published by
6# the Free Software Foundation; either version 3, or (at your option) 6# the Free Software Foundation; either version 3, or (at your option)
7# any later version. 7# any later version.
8# 8#
@@ -25,18 +25,18 @@ AT_DATA([delpic.scm],[
25 frames)) 25 frames))
26 26
27(set! idest-readonly #f) 27(set! idest-readonly #f)
28]) 28])
29 29
30AT_CHECK([ 30AT_CHECK([
31PREREQ_GUILE 31WITH_GUILE([
32genfile -f file -p $abs_srcdir/id3v2 10k 32genfile -f file -p $abs_srcdir/id3v2 10k
33cp file file.bak 33cp file file.bak
34echo removing APIC frames 34echo removing APIC frames
35idest -N -p $abs_top_srcdir/scheme -n -S delpic.scm file | 35idest -N -p $abs_top_srcdir/scheme -n -S delpic.scm file |
36 sed "s|$abs_top_srcdir|abs_top_srcdir|" 36 sed "s|$abs_top_srcdir|abs_top_srcdir|"])
37echo cmp 37echo cmp
38cmp file.bak file 38cmp file.bak file
39], 39],
40[0], 40[0],
41[removing APIC frames 41[removing APIC frames
42dry-run: loading ./delpic.scm ... 42dry-run: loading ./delpic.scm ...
diff --git a/tests/script06.at b/tests/script06.at
index 12f00e2..233466c 100644
--- a/tests/script06.at
+++ b/tests/script06.at
@@ -1,8 +1,8 @@
1# This file is part of idest -*- autotest -*- 1# This file is part of idest -*- autotest -*-
2# Copyright (C) 2011 Sergey Poznyakoff 2# Copyright (C) 2011, 2015 Sergey Poznyakoff
3# 3#
4# Idest is free software; you can redistribute it and/or modify 4# Idest is free software; you can redistribute it and/or modify
5# it under the terms of the GNU General Public License as published by 5# it under the terms of the GNU General Public License as published by
6# the Free Software Foundation; either version 3, or (at your option) 6# the Free Software Foundation; either version 3, or (at your option)
7# any later version. 7# any later version.
8# 8#
@@ -15,14 +15,14 @@
15# along with idest. If not, see <http://www.gnu.org/licenses/>. 15# along with idest. If not, see <http://www.gnu.org/licenses/>.
16 16
17AT_SETUP([basic scripting: formats]) 17AT_SETUP([basic scripting: formats])
18AT_KEYWORDS([script format script06]) 18AT_KEYWORDS([script format script06])
19 19
20AT_CHECK([ 20AT_CHECK([
21PREREQ_GUILE 21WITH_GUILE([
22idest -N -p $abs_top_srcdir/scheme --format framelist $abs_srcdir/id3v2 22idest -N -p $abs_top_srcdir/scheme --format framelist $abs_srcdir/id3v2])
23], 23],
24[0], 24[0],
25[TIT2 25[TIT2
26TALB 26TALB
27TRCK 27TRCK
28COMM 28COMM
diff --git a/tests/script07.at b/tests/script07.at
index 2a5d3c7..99c9b95 100644
--- a/tests/script07.at
+++ b/tests/script07.at
@@ -1,8 +1,8 @@
1# This file is part of idest -*- autotest -*- 1# This file is part of idest -*- autotest -*-
2# Copyright (C) 2011 Sergey Poznyakoff 2# Copyright (C) 2011, 2015 Sergey Poznyakoff
3# 3#
4# Idest is free software; you can redistribute it and/or modify 4# Idest is free software; you can redistribute it and/or modify
5# it under the terms of the GNU General Public License as published by 5# it under the terms of the GNU General Public License as published by
6# the Free Software Foundation; either version 3, or (at your option) 6# the Free Software Foundation; either version 3, or (at your option)
7# any later version. 7# any later version.
8# 8#
@@ -25,17 +25,17 @@ AT_DATA([delpic.scm],
25 (lambda (elt) 25 (lambda (elt)
26 (not (string=? (car elt) "APIC"))) 26 (not (string=? (car elt) "APIC")))
27 frames)) 27 frames))
28]) 28])
29 29
30AT_CHECK([ 30AT_CHECK([
31PREREQ_GUILE 31WITH_GUILE([
32genfile -f file -p $abs_srcdir/id3v2 10k 32genfile -f file -p $abs_srcdir/id3v2 10k
33$INSTALL_PROG -d scheme/idest/batch 33$INSTALL_PROG -d scheme/idest/batch
34$INSTALL_PROG delpic.scm scheme/idest/batch 34$INSTALL_PROG delpic.scm scheme/idest/batch
35idest -N -p $abs_top_srcdir/scheme:`pwd`/scheme --batch delpic file 35idest -N -p $abs_top_srcdir/scheme:`pwd`/scheme --batch delpic file])
36idest -a file 36idest -a file
37], 37],
38[0], 38[0],
39[TIT2: File 39[TIT2: File
40TALB: Idest Test Suite 40TALB: Idest Test Suite
41TRCK: 1 41TRCK: 1
diff --git a/tests/script08.at b/tests/script08.at
index d48e470..8ff78f7 100644
--- a/tests/script08.at
+++ b/tests/script08.at
@@ -1,8 +1,8 @@
1# This file is part of idest -*- autotest -*- 1# This file is part of idest -*- autotest -*-
2# Copyright (C) 2011 Sergey Poznyakoff 2# Copyright (C) 2011, 2015 Sergey Poznyakoff
3# 3#
4# Idest is free software; you can redistribute it and/or modify 4# Idest is free software; you can redistribute it and/or modify
5# it under the terms of the GNU General Public License as published by 5# it under the terms of the GNU General Public License as published by
6# the Free Software Foundation; either version 3, or (at your option) 6# the Free Software Foundation; either version 3, or (at your option)
7# any later version. 7# any later version.
8# 8#
@@ -25,21 +25,21 @@ AT_DATA([delpic.scm],
25 (lambda (elt) 25 (lambda (elt)
26 (not (string=? (car elt) "APIC"))) 26 (not (string=? (car elt) "APIC")))
27 frames)) 27 frames))
28]) 28])
29 29
30AT_CHECK([ 30AT_CHECK([
31PREREQ_GUILE 31WITH_GUILE([
32genfile -f file -p $abs_srcdir/id3v2 10k 32genfile -f file -p $abs_srcdir/id3v2 10k
33cp file file.bak 33cp file file.bak
34$INSTALL_PROG -d scheme/idest/batch 34$INSTALL_PROG -d scheme/idest/batch
35$INSTALL_PROG delpic.scm scheme/idest/batch 35$INSTALL_PROG delpic.scm scheme/idest/batch
36echo dry run 36echo dry run
37subdir=`pwd`/scheme 37subdir=`pwd`/scheme
38idest -N -p $abs_top_srcdir/scheme:$subdir -n --batch delpic file | 38idest -N -p $abs_top_srcdir/scheme:$subdir -n --batch delpic file |
39 sed "s|$subdir|subdir|;s|$abs_top_srcdir|abs_top_srcdir|" 39 sed "s|$subdir|subdir|;s|$abs_top_srcdir|abs_top_srcdir|"])
40echo cmp 40echo cmp
41cmp file.bak file 41cmp file.bak file
42], 42],
43[0], 43[0],
44[dry run 44[dry run
45dry-run: loading abs_top_srcdir/scheme/batch.scm ... 45dry-run: loading abs_top_srcdir/scheme/batch.scm ...
diff --git a/tests/setlyrics.at b/tests/setlyrics.at
index 2b9f983..dba8090 100644
--- a/tests/setlyrics.at
+++ b/tests/setlyrics.at
@@ -1,8 +1,8 @@
1# This file is part of idest -*- autotest -*- 1# This file is part of idest -*- autotest -*-
2# Copyright (C) 2011 Sergey Poznyakoff 2# Copyright (C) 2011, 2015 Sergey Poznyakoff
3# 3#
4# Idest is free software; you can redistribute it and/or modify 4# Idest is free software; you can redistribute it and/or modify
5# it under the terms of the GNU General Public License as published by 5# it under the terms of the GNU General Public License as published by
6# the Free Software Foundation; either version 3, or (at your option) 6# the Free Software Foundation; either version 3, or (at your option)
7# any later version. 7# any later version.
8# 8#
@@ -28,16 +28,16 @@ The idest utility allows to create new tags, and to view,
28modify or delete the existing ones. When compiled with Guile, 28modify or delete the existing ones. When compiled with Guile,
29IdEst allows you to write programs of arbitrary complexity for 29IdEst allows you to write programs of arbitrary complexity for
30manipulating ID3 tags and to apply them to any number of files. 30manipulating ID3 tags and to apply them to any number of files.
31]) 31])
32 32
33AT_CHECK([ 33AT_CHECK([
34PREREQ_GUILE 34WITH_GUILE([
35genfile -f file 10k 35genfile -f file 10k
36idest -N -p $abs_top_srcdir/scheme --batch \ 36idest -N -p $abs_top_srcdir/scheme --batch \
37 setlyrics --lang eng -c 'sample lyrics' -f input file 37 setlyrics --lang eng -c 'sample lyrics' -f input file])
38idest -a file | sed 's/ *$//' 38idest -a file | sed 's/ *$//'
39], 39],
40[0], 40[0],
41[USLT:eng:sample lyrics: 41[USLT:eng:sample lyrics:
42 42
43IdEst is an ID3 Edit and Scripting Tool, a command line utility for 43IdEst is an ID3 Edit and Scripting Tool, a command line utility for
diff --git a/tests/setpic.at b/tests/setpic.at
index 82642cb..e8ef343 100644
--- a/tests/setpic.at
+++ b/tests/setpic.at
@@ -1,8 +1,8 @@
1# This file is part of idest -*- autotest -*- 1# This file is part of idest -*- autotest -*-
2# Copyright (C) 2011 Sergey Poznyakoff 2# Copyright (C) 2011, 2015 Sergey Poznyakoff
3# 3#
4# Idest is free software; you can redistribute it and/or modify 4# Idest is free software; you can redistribute it and/or modify
5# it under the terms of the GNU General Public License as published by 5# it under the terms of the GNU General Public License as published by
6# the Free Software Foundation; either version 3, or (at your option) 6# the Free Software Foundation; either version 3, or (at your option)
7# any later version. 7# any later version.
8# 8#
@@ -16,16 +16,16 @@
16 16
17AT_SETUP([batch: setpic]) 17AT_SETUP([batch: setpic])
18AT_KEYWORDS([script batch setpic]) 18AT_KEYWORDS([script batch setpic])
19 19
20 20
21AT_CHECK([ 21AT_CHECK([
22PREREQ_GUILE 22WITH_GUILE([
23genfile -f file 10k 23genfile -f file 10k
24idest -N -p $abs_top_srcdir/scheme --batch \ 24idest -N -p $abs_top_srcdir/scheme --batch \
25 setpic -d '32x32 picture' -f $abs_srcdir/idest-32.png file 25 setpic -d '32x32 picture' -f $abs_srcdir/idest-32.png file])
26idest -a file | sed 's/ *$//' 26idest -a file | sed 's/ *$//'
27], 27],
28[0], 28[0],
29[APIC:image/png:0:32x32 picture: 89504E470D0A1A0A0000000D4948445200000020000000200806000000737A7AF4000000017352474200AECE1CE900000006624B474400FF00FF00FFA0BDA793000000097048597300000B1300000B1301009A9C180000000774494D4507DB071C093A2D7365CBF80000001974455874436F6D6D656E74004372656174656420776974682047494D5057810E17000000954944415458C3ED56D10A002108D3E8FF7F79F7D421125D696107FA16452E5D6E0C00141885826309003313339BF7AFAC40F55EB0FAE2AD1568C9019095CBFF226102D0D1FA6EF97E2F8F72122680049000AE96E3DE749B9D5B5229DD7EE0E4B07419125D21A90DF2CCE801653691169C911991EBE32D98EDF5F65FA0135AE5D8ED07BC04ADAB64EB116DD4822F12A6214900E1001E26BD48441311DC6B0000000049454E44AE426082 29[APIC:image/png:0:32x32 picture: 89504E470D0A1A0A0000000D4948445200000020000000200806000000737A7AF4000000017352474200AECE1CE900000006624B474400FF00FF00FFA0BDA793000000097048597300000B1300000B1301009A9C180000000774494D4507DB071C093A2D7365CBF80000001974455874436F6D6D656E74004372656174656420776974682047494D5057810E17000000954944415458C3ED56D10A002108D3E8FF7F79F7D421125D696107FA16452E5D6E0C00141885826309003313339BF7AFAC40F55EB0FAE2AD1568C9019095CBFF226102D0D1FA6EF97E2F8F72122680049000AE96E3DE749B9D5B5229DD7EE0E4B07419125D21A90DF2CCE801653691169C911991EBE32D98EDF5F65FA0135AE5D8ED07BC04ADAB64EB116DD4822F12A6214900E1001E26BD48441311DC6B0000000049454E44AE426082
30]) 30])
31x 31x
diff --git a/tests/settitle.at b/tests/settitle.at
index bd71e79..7afb9db 100644
--- a/tests/settitle.at
+++ b/tests/settitle.at
@@ -1,8 +1,8 @@
1# This file is part of idest -*- autotest -*- 1# This file is part of idest -*- autotest -*-
2# Copyright (C) 2011 Sergey Poznyakoff 2# Copyright (C) 2011, 2015 Sergey Poznyakoff
3# 3#
4# Idest is free software; you can redistribute it and/or modify 4# Idest is free software; you can redistribute it and/or modify
5# it under the terms of the GNU General Public License as published by 5# it under the terms of the GNU General Public License as published by
6# the Free Software Foundation; either version 3, or (at your option) 6# the Free Software Foundation; either version 3, or (at your option)
7# any later version. 7# any later version.
8# 8#
@@ -15,17 +15,16 @@
15# along with idest. If not, see <http://www.gnu.org/licenses/>. 15# along with idest. If not, see <http://www.gnu.org/licenses/>.
16 16
17AT_SETUP([examples: settitle]) 17AT_SETUP([examples: settitle])
18AT_KEYWORDS([script examples settitle]) 18AT_KEYWORDS([script examples settitle])
19 19
20AT_CHECK([ 20AT_CHECK([
21PREREQ_GUILE 21WITH_GUILE([
22
23genfile -f Test_file_for_idest.mp3 10k 22genfile -f Test_file_for_idest.mp3 10k
24idest -N -S $abs_top_srcdir/examples/settitle.scm Test_file_for_idest.mp3 23idest -N -S $abs_top_srcdir/examples/settitle.scm Test_file_for_idest.mp3
25idest -a Test_file_for_idest.mp3 24idest -a Test_file_for_idest.mp3])
26], 25],
27[0], 26[0],
28[TIT2: Test file for idest 27[TIT2: Test file for idest
29]) 28])
30 29
31AT_CLEANUP 30AT_CLEANUP
diff --git a/tests/shortlist.at b/tests/shortlist.at
index cb13aba..b4c25c2 100644
--- a/tests/shortlist.at
+++ b/tests/shortlist.at
@@ -1,8 +1,8 @@
1# This file is part of idest -*- autotest -*- 1# This file is part of idest -*- autotest -*-
2# Copyright (C) 2011 Sergey Poznyakoff 2# Copyright (C) 2011, 2015 Sergey Poznyakoff
3# 3#
4# Idest is free software; you can redistribute it and/or modify 4# Idest is free software; you can redistribute it and/or modify
5# it under the terms of the GNU General Public License as published by 5# it under the terms of the GNU General Public License as published by
6# the Free Software Foundation; either version 3, or (at your option) 6# the Free Software Foundation; either version 3, or (at your option)
7# any later version. 7# any later version.
8# 8#
@@ -15,18 +15,17 @@
15# along with idest. If not, see <http://www.gnu.org/licenses/>. 15# along with idest. If not, see <http://www.gnu.org/licenses/>.
16 16
17AT_SETUP([examples: shortlist]) 17AT_SETUP([examples: shortlist])
18AT_KEYWORDS([script examples shortlist]) 18AT_KEYWORDS([script examples shortlist])
19 19
20AT_CHECK([ 20AT_CHECK([
21PREREQ_GUILE 21WITH_GUILE([
22
23genfile -f file1 -s $abs_srcdir/id3v1 10k 22genfile -f file1 -s $abs_srcdir/id3v1 10k
24genfile -f file2 -p $abs_srcdir/id3v2 10k 23genfile -f file2 -p $abs_srcdir/id3v2 10k
25 24
26idest -N -S $abs_top_srcdir/examples/shortlist.scm file1 file2 25idest -N -S $abs_top_srcdir/examples/shortlist.scm file1 file2])
27], 26],
28[0], 27[0],
29[file1: File by Sergey Poznyakoff, 2011 28[file1: File by Sergey Poznyakoff, 2011
30file2: File by Sergey Poznyakoff, 2011 29file2: File by Sergey Poznyakoff, 2011
31]) 30])
32 31
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 196567d..1168a52 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -1,8 +1,8 @@
1# This file is part of idest 1# This file is part of idest
2# Copyright (C) 2011 Sergey Poznyakoff 2# Copyright (C) 2011, 2015 Sergey Poznyakoff
3# 3#
4# Idest is free software; you can redistribute it and/or modify 4# Idest is free software; you can redistribute it and/or modify
5# it under the terms of the GNU General Public License as published by 5# it under the terms of the GNU General Public License as published by
6# the Free Software Foundation; either version 3, or (at your option) 6# the Free Software Foundation; either version 3, or (at your option)
7# any later version. 7# any later version.
8# 8#
@@ -16,12 +16,17 @@
16 16
17m4_version_prereq([2.52g]) 17m4_version_prereq([2.52g])
18 18
19m4_define([AT_SKIP_TEST],[exit 77]) 19m4_define([AT_SKIP_TEST],[exit 77])
20 20
21m4_define([PREREQ_GUILE],[test -z "$GUILE_VERSION" && AT_SKIP_TEST]) 21m4_define([PREREQ_GUILE],[test -z "$GUILE_VERSION" && AT_SKIP_TEST])
22m4_define([WITH_GUILE],[PREREQ_GUILE
23($1) 2>stderr.log
24sed '/^;;; /d' stderr.log >&2
25rm stderr.log
26])
22 27
23dnl # Begin tests 28dnl # Begin tests
24 29
25AT_INIT 30AT_INIT
26m4_include([version.at]) 31m4_include([version.at])
27m4_include([query-v1-00.at]) 32m4_include([query-v1-00.at])

Return to:

Send suggestions and report system problems to the System administrator.