-rw-r--r-- | tests/atlocal.in | 3 | ||||
-rw-r--r-- | tests/delcomm.at | 6 | ||||
-rw-r--r-- | tests/fmt-shortlist.at | 7 | ||||
-rw-r--r-- | tests/framelist00.at | 6 | ||||
-rw-r--r-- | tests/framelist01.at | 6 | ||||
-rw-r--r-- | tests/framelist02.at | 6 | ||||
-rw-r--r-- | tests/list1.at | 7 | ||||
-rw-r--r-- | tests/list2.at | 7 | ||||
-rw-r--r-- | tests/lyrics00.at | 6 | ||||
-rw-r--r-- | tests/pic00.at | 5 | ||||
-rw-r--r-- | tests/pic01.at | 6 | ||||
-rw-r--r-- | tests/script00.at | 6 | ||||
-rw-r--r-- | tests/script01.at | 6 | ||||
-rw-r--r-- | tests/script02.at | 6 | ||||
-rw-r--r-- | tests/script03.at | 6 | ||||
-rw-r--r-- | tests/script04.at | 6 | ||||
-rw-r--r-- | tests/script05.at | 6 | ||||
-rw-r--r-- | tests/script06.at | 6 | ||||
-rw-r--r-- | tests/script07.at | 6 | ||||
-rw-r--r-- | tests/script08.at | 6 | ||||
-rw-r--r-- | tests/setlyrics.at | 6 | ||||
-rw-r--r-- | tests/setpic.at | 6 | ||||
-rw-r--r-- | tests/settitle.at | 7 | ||||
-rw-r--r-- | tests/shortlist.at | 7 | ||||
-rw-r--r-- | tests/testsuite.at | 7 |
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 | |||
10 | 10 | ||
11 | GUILE_VERSION="@GUILE_VERSION@" | 11 | GUILE_VERSION="@GUILE_VERSION@" |
12 | INSTALL_PROG="@INSTALL@" | 12 | INSTALL_PROG="@INSTALL@" |
13 | 13 | GUILE_AUTO_COMPILE=0 | |
14 | export 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,5 +1,5 @@ | |||
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 |
@@ -18,11 +18,11 @@ AT_SETUP([examples: delcomm]) | |||
18 | AT_KEYWORDS([script examples delcomm]) | 18 | AT_KEYWORDS([script examples delcomm]) |
19 | 19 | ||
20 | AT_CHECK([ | 20 | AT_CHECK([ |
21 | PREREQ_GUILE | 21 | WITH_GUILE([ |
22 | genfile -f file1 -s $abs_srcdir/id3v1 10k | 22 | genfile -f file1 -s $abs_srcdir/id3v1 10k |
23 | genfile -f file2 -p $abs_srcdir/id3v2 10k | 23 | genfile -f file2 -p $abs_srcdir/id3v2 10k |
24 | 24 | ||
25 | idest -N -S $abs_top_srcdir/examples/delcomm.scm file1 file2 | 25 | idest -N -S $abs_top_srcdir/examples/delcomm.scm file1 file2]) |
26 | echo file1 | 26 | echo file1 |
27 | idest -a file1 | 27 | idest -a file1 |
28 | echo file2 | 28 | 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 @@ | |||
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 |
@@ -18,12 +18,11 @@ AT_SETUP([formats: shortlist]) | |||
18 | AT_KEYWORDS([script format shortlist]) | 18 | AT_KEYWORDS([script format shortlist]) |
19 | 19 | ||
20 | AT_CHECK([ | 20 | AT_CHECK([ |
21 | PREREQ_GUILE | 21 | WITH_GUILE([ |
22 | |||
23 | genfile -f file1 -s $abs_srcdir/id3v1 10k | 22 | genfile -f file1 -s $abs_srcdir/id3v1 10k |
24 | genfile -f file2 -p $abs_srcdir/id3v2 10k | 23 | genfile -f file2 -p $abs_srcdir/id3v2 10k |
25 | 24 | ||
26 | idest -N -p $abs_top_srcdir/scheme --format shortlist file1 file2 | 25 | idest -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 |
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 @@ | |||
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 |
@@ -18,9 +18,9 @@ AT_SETUP([formats: framelist --full]) | |||
18 | AT_KEYWORDS([script format framelist--full framelist00]) | 18 | AT_KEYWORDS([script format framelist--full framelist00]) |
19 | 19 | ||
20 | AT_CHECK([ | 20 | AT_CHECK([ |
21 | PREREQ_GUILE | 21 | WITH_GUILE([ |
22 | genfile -f file -p $abs_srcdir/id3v2 10k | 22 | genfile -f file -p $abs_srcdir/id3v2 10k |
23 | idest -N -p $abs_top_srcdir/scheme --format framelist --full file | 23 | idest -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" |
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 @@ | |||
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 |
@@ -18,9 +18,9 @@ AT_SETUP([formats: framelist --frames]) | |||
18 | AT_KEYWORDS([script format framelist--frames framelist01]) | 18 | AT_KEYWORDS([script format framelist--frames framelist01]) |
19 | 19 | ||
20 | AT_CHECK([ | 20 | AT_CHECK([ |
21 | PREREQ_GUILE | 21 | WITH_GUILE([ |
22 | genfile -f file -p $abs_srcdir/id3v2 10k | 22 | genfile -f file -p $abs_srcdir/id3v2 10k |
23 | idest -N -p $abs_top_srcdir/scheme --format framelist --frames TIT2,COMM,APIC file | 23 | idest -N -p $abs_top_srcdir/scheme --format framelist --frames TIT2,COMM,APIC file]) |
24 | ], | 24 | ], |
25 | [0], | 25 | [0], |
26 | [TIT2 | 26 | [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 @@ | |||
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 |
@@ -18,9 +18,9 @@ AT_SETUP([formats: framelist --single-line]) | |||
18 | AT_KEYWORDS([script format framelist--single-line framelist02]) | 18 | AT_KEYWORDS([script format framelist--single-line framelist02]) |
19 | 19 | ||
20 | AT_CHECK([ | 20 | AT_CHECK([ |
21 | PREREQ_GUILE | 21 | WITH_GUILE([ |
22 | genfile -f file -p $abs_srcdir/id3v2 10k | 22 | genfile -f file -p $abs_srcdir/id3v2 10k |
23 | idest -N -p $abs_top_srcdir/scheme --format framelist --single-line file | 23 | idest -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 |
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 @@ | |||
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 |
@@ -18,12 +18,11 @@ AT_SETUP([examples: list1]) | |||
18 | AT_KEYWORDS([script examples list1]) | 18 | AT_KEYWORDS([script examples list1]) |
19 | 19 | ||
20 | AT_CHECK([ | 20 | AT_CHECK([ |
21 | PREREQ_GUILE | 21 | WITH_GUILE([ |
22 | |||
23 | genfile -f file1 -s $abs_srcdir/id3v1 10k | 22 | genfile -f file1 -s $abs_srcdir/id3v1 10k |
24 | genfile -f file2 -p $abs_srcdir/id3v2 10k | 23 | genfile -f file2 -p $abs_srcdir/id3v2 10k |
25 | 24 | ||
26 | idest -N -S $abs_top_srcdir/examples/list1.scm file1 file2 | 25 | idest -N -S $abs_top_srcdir/examples/list1.scm file1 file2]) |
27 | ], | 26 | ], |
28 | [0], | 27 | [0], |
29 | [file1 | 28 | [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 @@ | |||
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 |
@@ -18,12 +18,11 @@ AT_SETUP([examples: list2]) | |||
18 | AT_KEYWORDS([script examples list2]) | 18 | AT_KEYWORDS([script examples list2]) |
19 | 19 | ||
20 | AT_CHECK([ | 20 | AT_CHECK([ |
21 | PREREQ_GUILE | 21 | WITH_GUILE([ |
22 | |||
23 | genfile -f file1 -s $abs_srcdir/id3v1 10k | 22 | genfile -f file1 -s $abs_srcdir/id3v1 10k |
24 | genfile -f file2 -p $abs_srcdir/id3v2 10k | 23 | genfile -f file2 -p $abs_srcdir/id3v2 10k |
25 | 24 | ||
26 | idest -N -S $abs_top_srcdir/examples/list2.scm TIT2,TALB,COMM,TENC file1 file2 | 25 | idest -N -S $abs_top_srcdir/examples/list2.scm TIT2,TALB,COMM,TENC file1 file2]) |
27 | ], | 26 | ], |
28 | [0], | 27 | [0], |
29 | [file1 | 28 | [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 @@ | |||
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 |
@@ -18,10 +18,10 @@ AT_SETUP([formats: lyrics]) | |||
18 | AT_KEYWORDS([script format lyrics lyrics00]) | 18 | AT_KEYWORDS([script format lyrics lyrics00]) |
19 | 19 | ||
20 | AT_CHECK([ | 20 | AT_CHECK([ |
21 | PREREQ_GUILE | 21 | WITH_GUILE([ |
22 | genfile -f file -p $abs_srcdir/id3v2 10k | 22 | genfile -f file -p $abs_srcdir/id3v2 10k |
23 | unset PAGER | 23 | unset PAGER |
24 | idest -N -p $abs_top_srcdir/scheme --format lyrics file | 24 | idest -N -p $abs_top_srcdir/scheme --format lyrics file]) |
25 | ], | 25 | ], |
26 | [0], | 26 | [0], |
27 | [File | 27 | [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 @@ | |||
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 |
@@ -18,8 +18,7 @@ AT_SETUP([formats: pic --help]) | |||
18 | AT_KEYWORDS([script format pic--help pic00]) | 18 | AT_KEYWORDS([script format pic--help pic00]) |
19 | 19 | ||
20 | AT_CHECK([ | 20 | AT_CHECK([ |
21 | PREREQ_GUILE | 21 | WITH_GUILE([idest -N -p $abs_top_srcdir/scheme --format pic --help]) |
22 | idest -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... |
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 @@ | |||
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 |
@@ -18,9 +18,9 @@ AT_SETUP([formats: pic --store]) | |||
18 | AT_KEYWORDS([script format pic--store pic01]) | 18 | AT_KEYWORDS([script format pic--store pic01]) |
19 | 19 | ||
20 | AT_CHECK([ | 20 | AT_CHECK([ |
21 | PREREQ_GUILE | 21 | WITH_GUILE([ |
22 | genfile -f file -p $abs_srcdir/id3v2 10k | 22 | genfile -f file -p $abs_srcdir/id3v2 10k |
23 | idest -N -p $abs_top_srcdir/scheme --format pic --store --file ~N-~C.~T file | 23 | idest -N -p $abs_top_srcdir/scheme --format pic --store --file ~N-~C.~T file]) |
24 | echo file-32x32 sample image.png | 24 | echo file-32x32 sample image.png |
25 | cmp "file-32x32 sample image.png" $abs_srcdir/idest-32.png | 25 | cmp "file-32x32 sample image.png" $abs_srcdir/idest-32.png |
26 | echo file-68x68 sample image.png | 26 | 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 @@ | |||
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 |
@@ -29,11 +29,11 @@ AT_DATA([framelist.scm],[ | |||
29 | ]) | 29 | ]) |
30 | 30 | ||
31 | AT_CHECK([ | 31 | AT_CHECK([ |
32 | PREREQ_GUILE | 32 | WITH_GUILE([ |
33 | genfile -f file1 -s $abs_srcdir/id3v1 10k | 33 | genfile -f file1 -s $abs_srcdir/id3v1 10k |
34 | genfile -f file2 -p $abs_srcdir/id3v2 10k | 34 | genfile -f file2 -p $abs_srcdir/id3v2 10k |
35 | 35 | ||
36 | idest -N -S ./framelist.scm file1 file2 | 36 | idest -N -S ./framelist.scm file1 file2]) |
37 | ], | 37 | ], |
38 | [0], | 38 | [0], |
39 | [file1 | 39 | [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 @@ | |||
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 |
@@ -29,7 +29,7 @@ AT_DATA([framelist.scm],[ | |||
29 | ]) | 29 | ]) |
30 | 30 | ||
31 | AT_CHECK([ | 31 | AT_CHECK([ |
32 | PREREQ_GUILE | 32 | WITH_GUILE([ |
33 | genfile -f file1 -s $abs_srcdir/id3v1 10k | 33 | genfile -f file1 -s $abs_srcdir/id3v1 10k |
34 | genfile -f file2 -p $abs_srcdir/id3v2 10k | 34 | genfile -f file2 -p $abs_srcdir/id3v2 10k |
35 | 35 | ||
@@ -38,7 +38,7 @@ idest -N -S framelist file1 file2 | |||
38 | echo In subdir | 38 | echo In subdir |
39 | mkdir subdir | 39 | mkdir subdir |
40 | mv framelist.scm subdir | 40 | mv framelist.scm subdir |
41 | idest -N -P `pwd`/subdir -S framelist file1 file2 | 41 | idest -N -P `pwd`/subdir -S framelist file1 file2]) |
42 | ], | 42 | ], |
43 | [0], | 43 | [0], |
44 | [In current working dir | 44 | [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 @@ | |||
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 |
@@ -39,9 +39,9 @@ AT_DATA([.idest.scm],[ | |||
39 | ]) | 39 | ]) |
40 | 40 | ||
41 | AT_CHECK([ | 41 | AT_CHECK([ |
42 | PREREQ_GUILE | 42 | WITH_GUILE([ |
43 | genfile -f file1 -s $abs_srcdir/id3v1 10k | 43 | genfile -f file1 -s $abs_srcdir/id3v1 10k |
44 | HOME=/tmp idest -S ./framelist.scm file1 | sed '4s|.*/idest/idest.scm|GUILE_SITE_DIR/idest/idest.scm|' | 44 | HOME=/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 |
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 @@ | |||
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 |
@@ -26,9 +26,9 @@ AT_DATA([test.scm],[ | |||
26 | ]) | 26 | ]) |
27 | 27 | ||
28 | AT_CHECK([ | 28 | AT_CHECK([ |
29 | PREREQ_GUILE | 29 | WITH_GUILE([ |
30 | genfile -f file -s $abs_srcdir/id3v1 10k | 30 | genfile -f file -s $abs_srcdir/id3v1 10k |
31 | idest -N -S ./test.scm | 31 | idest -N -S ./test.scm]) |
32 | ], | 32 | ], |
33 | [0], | 33 | [0], |
34 | [file | 34 | [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 @@ | |||
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 |
@@ -28,10 +28,10 @@ AT_DATA([delpic.scm],[ | |||
28 | ]) | 28 | ]) |
29 | 29 | ||
30 | AT_CHECK([ | 30 | AT_CHECK([ |
31 | PREREQ_GUILE | 31 | WITH_GUILE([ |
32 | genfile -f file -p $abs_srcdir/id3v2 10k | 32 | genfile -f file -p $abs_srcdir/id3v2 10k |
33 | echo removing APIC frames | 33 | echo removing APIC frames |
34 | idest -N -S ./delpic.scm file | 34 | idest -N -S ./delpic.scm file]) |
35 | echo tags | 35 | echo tags |
36 | idest -a file | 36 | idest -a file |
37 | ], | 37 | ], |
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 @@ | |||
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 |
@@ -28,12 +28,12 @@ AT_DATA([delpic.scm],[ | |||
28 | ]) | 28 | ]) |
29 | 29 | ||
30 | AT_CHECK([ | 30 | AT_CHECK([ |
31 | PREREQ_GUILE | 31 | WITH_GUILE([ |
32 | genfile -f file -p $abs_srcdir/id3v2 10k | 32 | genfile -f file -p $abs_srcdir/id3v2 10k |
33 | cp file file.bak | 33 | cp file file.bak |
34 | echo removing APIC frames | 34 | echo removing APIC frames |
35 | idest -N -p $abs_top_srcdir/scheme -n -S delpic.scm file | | 35 | idest -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|"]) |
37 | echo cmp | 37 | echo cmp |
38 | cmp file.bak file | 38 | cmp file.bak file |
39 | ], | 39 | ], |
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 @@ | |||
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 |
@@ -18,8 +18,8 @@ AT_SETUP([basic scripting: formats]) | |||
18 | AT_KEYWORDS([script format script06]) | 18 | AT_KEYWORDS([script format script06]) |
19 | 19 | ||
20 | AT_CHECK([ | 20 | AT_CHECK([ |
21 | PREREQ_GUILE | 21 | WITH_GUILE([ |
22 | idest -N -p $abs_top_srcdir/scheme --format framelist $abs_srcdir/id3v2 | 22 | idest -N -p $abs_top_srcdir/scheme --format framelist $abs_srcdir/id3v2]) |
23 | ], | 23 | ], |
24 | [0], | 24 | [0], |
25 | [TIT2 | 25 | [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 @@ | |||
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 |
@@ -28,11 +28,11 @@ AT_DATA([delpic.scm], | |||
28 | ]) | 28 | ]) |
29 | 29 | ||
30 | AT_CHECK([ | 30 | AT_CHECK([ |
31 | PREREQ_GUILE | 31 | WITH_GUILE([ |
32 | genfile -f file -p $abs_srcdir/id3v2 10k | 32 | genfile -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 |
35 | idest -N -p $abs_top_srcdir/scheme:`pwd`/scheme --batch delpic file | 35 | idest -N -p $abs_top_srcdir/scheme:`pwd`/scheme --batch delpic file]) |
36 | idest -a file | 36 | idest -a file |
37 | ], | 37 | ], |
38 | [0], | 38 | [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 @@ | |||
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 |
@@ -28,7 +28,7 @@ AT_DATA([delpic.scm], | |||
28 | ]) | 28 | ]) |
29 | 29 | ||
30 | AT_CHECK([ | 30 | AT_CHECK([ |
31 | PREREQ_GUILE | 31 | WITH_GUILE([ |
32 | genfile -f file -p $abs_srcdir/id3v2 10k | 32 | genfile -f file -p $abs_srcdir/id3v2 10k |
33 | cp file file.bak | 33 | cp file file.bak |
34 | $INSTALL_PROG -d scheme/idest/batch | 34 | $INSTALL_PROG -d scheme/idest/batch |
@@ -36,7 +36,7 @@ $INSTALL_PROG delpic.scm scheme/idest/batch | |||
36 | echo dry run | 36 | echo dry run |
37 | subdir=`pwd`/scheme | 37 | subdir=`pwd`/scheme |
38 | idest -N -p $abs_top_srcdir/scheme:$subdir -n --batch delpic file | | 38 | idest -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|"]) |
40 | echo cmp | 40 | echo cmp |
41 | cmp file.bak file | 41 | cmp file.bak file |
42 | ], | 42 | ], |
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 @@ | |||
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 |
@@ -31,10 +31,10 @@ manipulating ID3 tags and to apply them to any number of files. | |||
31 | ]) | 31 | ]) |
32 | 32 | ||
33 | AT_CHECK([ | 33 | AT_CHECK([ |
34 | PREREQ_GUILE | 34 | WITH_GUILE([ |
35 | genfile -f file 10k | 35 | genfile -f file 10k |
36 | idest -N -p $abs_top_srcdir/scheme --batch \ | 36 | idest -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]) |
38 | idest -a file | sed 's/ *$//' | 38 | idest -a file | sed 's/ *$//' |
39 | ], | 39 | ], |
40 | [0], | 40 | [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 @@ | |||
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 |
@@ -19,10 +19,10 @@ AT_KEYWORDS([script batch setpic]) | |||
19 | 19 | ||
20 | 20 | ||
21 | AT_CHECK([ | 21 | AT_CHECK([ |
22 | PREREQ_GUILE | 22 | WITH_GUILE([ |
23 | genfile -f file 10k | 23 | genfile -f file 10k |
24 | idest -N -p $abs_top_srcdir/scheme --batch \ | 24 | idest -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]) |
26 | idest -a file | sed 's/ *$//' | 26 | idest -a file | sed 's/ *$//' |
27 | ], | 27 | ], |
28 | [0], | 28 | [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 @@ | |||
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 |
@@ -18,11 +18,10 @@ AT_SETUP([examples: settitle]) | |||
18 | AT_KEYWORDS([script examples settitle]) | 18 | AT_KEYWORDS([script examples settitle]) |
19 | 19 | ||
20 | AT_CHECK([ | 20 | AT_CHECK([ |
21 | PREREQ_GUILE | 21 | WITH_GUILE([ |
22 | |||
23 | genfile -f Test_file_for_idest.mp3 10k | 22 | genfile -f Test_file_for_idest.mp3 10k |
24 | idest -N -S $abs_top_srcdir/examples/settitle.scm Test_file_for_idest.mp3 | 23 | idest -N -S $abs_top_srcdir/examples/settitle.scm Test_file_for_idest.mp3 |
25 | idest -a Test_file_for_idest.mp3 | 24 | idest -a Test_file_for_idest.mp3]) |
26 | ], | 25 | ], |
27 | [0], | 26 | [0], |
28 | [TIT2: Test file for idest | 27 | [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 @@ | |||
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 |
@@ -18,12 +18,11 @@ AT_SETUP([examples: shortlist]) | |||
18 | AT_KEYWORDS([script examples shortlist]) | 18 | AT_KEYWORDS([script examples shortlist]) |
19 | 19 | ||
20 | AT_CHECK([ | 20 | AT_CHECK([ |
21 | PREREQ_GUILE | 21 | WITH_GUILE([ |
22 | |||
23 | genfile -f file1 -s $abs_srcdir/id3v1 10k | 22 | genfile -f file1 -s $abs_srcdir/id3v1 10k |
24 | genfile -f file2 -p $abs_srcdir/id3v2 10k | 23 | genfile -f file2 -p $abs_srcdir/id3v2 10k |
25 | 24 | ||
26 | idest -N -S $abs_top_srcdir/examples/shortlist.scm file1 file2 | 25 | idest -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 |
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 @@ | |||
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 |
@@ -19,6 +19,11 @@ m4_version_prereq([2.52g]) | |||
19 | m4_define([AT_SKIP_TEST],[exit 77]) | 19 | m4_define([AT_SKIP_TEST],[exit 77]) |
20 | 20 | ||
21 | m4_define([PREREQ_GUILE],[test -z "$GUILE_VERSION" && AT_SKIP_TEST]) | 21 | m4_define([PREREQ_GUILE],[test -z "$GUILE_VERSION" && AT_SKIP_TEST]) |
22 | m4_define([WITH_GUILE],[PREREQ_GUILE | ||
23 | ($1) 2>stderr.log | ||
24 | sed '/^;;; /d' stderr.log >&2 | ||
25 | rm stderr.log | ||
26 | ]) | ||
22 | 27 | ||
23 | dnl # Begin tests | 28 | dnl # Begin tests |
24 | 29 | ||