31 files changed, 802 insertions, 8 deletions

diff --git a/Makefile.am b/Makefile.am
index e19d967..dd2c846 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@ if IDEST_COND_GUILE
   SCHEME_DIR = scheme
 endif
 
-SUBDIRS=gnu libid3tag gint src doc examples $(SCHEME_DIR)
+SUBDIRS=gnu libid3tag gint src doc examples $(SCHEME_DIR) tests
 
 .PHONY: ChangeLog
 ChangeLog: 
diff --git a/configure.ac b/configure.ac
index 772ea62..296ae0e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,6 +64,11 @@ EOF
 ],
 [status_guile=$status_guile])
 
+# Initialize the test suite.
+AC_CONFIG_TESTDIR(tests)
+AC_CONFIG_FILES([tests/Makefile tests/atlocal])
+AM_MISSING_PROG([AUTOM4TE], [autom4te])
+
 AC_CONFIG_FILES([Makefile
                  gnu/Makefile
                  gint/Makefile 
diff --git a/src/Makefile.am b/src/Makefile.am
index 1cd02d8..bd06dbf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,6 +15,7 @@
 # along with Idest.  If not, see <http://www.gnu.org/licenses/>.
 
 bin_PROGRAMS=idest
+
 idest_SOURCES=\
  backup.c\
  editem.c\
diff --git a/src/cmdline.opt b/src/cmdline.opt
index c43d285..9ed798f 100644
--- a/src/cmdline.opt
+++ b/src/cmdline.opt
@@ -246,7 +246,7 @@ get_options(int argc, char *argv[])
         if (optind < argc && mode == MODE_MOD) {
                 char *p;
                 /* See if we've been given any assignment arguments */
-                while (p = strchr(argv[optind], '=')) {
+                while (argv[optind] && (p = strchr(argv[optind], '='))) {
                         *p++ = 0;
                         input_list_add_assignment(argv[optind++], p);
                 }
diff --git a/src/frametab.gperf b/src/frametab.gperf
index dd4acd2..15310c9 100644
--- a/src/frametab.gperf
+++ b/src/frametab.gperf
@@ -22,8 +22,8 @@
 #define DQ(name) static char *QID(name)[]
 
 DQ(COMM) = { "lang", "condesc" };
-DQ(TXXX) = { "descr" };
-DQ(WXXX) = { "descr" };
+DQ(TXXX) = { "condesc" };
+DQ(WXXX) = { "condesc" };
 DQ(APIC) = { "mime-type", "pic-type", "condesc" };
 
 #define QUAL(name) sizeof(QID(name))/sizeof(QID(name)[0]), QID(name)
diff --git a/src/getopt.m4 b/src/getopt.m4
index 19ee33c..9267de2 100644
--- a/src/getopt.m4
+++ b/src/getopt.m4
@@ -496,7 +496,7 @@ define([<OPTIONS_BEGIN>],
    [<divert(-1)
      define([<GETOPT_STYLE>],[<$1>]) 
      ifelse([<$1>],[<gnu>],
-       [<STDFUNC([<$2 " (" PACKAGE_STRING ")">], [<$2>], [<$3>], [<$4>])>])
+       [<STDFUNC([<$2 " (" PACKAGE_NAME ") " PACKAGE_VERSION>], [<$2>], [<$3>], [<$4>])>])
 >])
   
 define([<OPTIONS_END>],[<
diff --git a/src/guile.c b/src/guile.c
index 901d398..d3ceade 100644
--- a/src/guile.c
+++ b/src/guile.c
@@ -23,7 +23,6 @@
 int no_init_files_option;
 int guile_inited = 0;
 int guile_debug = 1;
-char **guile_argv;
 
 SCM_GLOBAL_VARIABLE_INIT(sym_idest_main, "idest-main", SCM_EOL);
 SCM_GLOBAL_VARIABLE_INIT(sym_idest_readonly, "idest-readonly", SCM_BOOL_T);
@@ -720,12 +719,12 @@ guile_list(const char *file, struct id3_tag *tag)
 }
 
 void
-guile_init(int *pargc, char **pargv)
+guile_init(int *pargc, char ***pargv)
 {
 }
 
 void
-guile_add_load_path(const char *arg)
+guile_add_load_path(const char *arg, int li)
 {
 }
 
diff --git a/src/main.c b/src/main.c
index e3a82df..54a987d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -32,6 +32,7 @@ struct id3_tag *source_tag;
 
 char *format_name;
 char *batch_name;
+char **guile_argv;
 
 
 struct item_info {
diff --git a/tests/.gitignore b/tests/.gitignore
new file mode 100644
index 0000000..11f17b8
--- /dev/null
+++ b/tests/.gitignore
@@ -0,0 +1,7 @@
+atconfig
+atlocal
+genfile
+package.m4
+testsuite
+testsuite.dir
+testsuite.log
diff --git a/tests/Makefile.am b/tests/Makefile.am
new file mode 100644
index 0000000..4463d13
--- /dev/null
+++ b/tests/Makefile.am
@@ -0,0 +1,95 @@
+# This file is part of idest
+# Copyright (C) 2011 Sergey Poznyakoff
+#
+# Idest is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# Idest is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with idest.  If not, see <http://www.gnu.org/licenses/>.
+
+EXTRA_DIST = \
+ $(TESTSUITE_AT)\
+ testsuite\
+ package.m4\
+ id3v1\
+ id3v1-2\
+ id3v2
+
+DISTCLEANFILES       = atconfig
+MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE)
+
+
+## ------------ ##
+## package.m4.  ##
+## ------------ ##
+
+$(srcdir)/package.m4: $(top_srcdir)/configure.ac $(srcdir)/Makefile
+        $(AM_V_GEN){                                      \
+          echo '# Signature of the current package.'; \
+          echo 'm4_define([AT_PACKAGE_NAME],      [@PACKAGE_NAME@])'; \
+          echo 'm4_define([AT_PACKAGE_TARNAME],   [@PACKAGE_TARNAME@])'; \
+          echo 'm4_define([AT_PACKAGE_VERSION],   [@PACKAGE_VERSION@])'; \
+          echo 'm4_define([AT_PACKAGE_STRING],    [@PACKAGE_STRING@])'; \
+          echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
+          echo 'm4_define([AT_PACKAGE_GUILE],     [@GUILE_VERSION@])'; \
+        } >$(srcdir)/package.m4
+
+#
+
+## ------------ ##
+## Test suite.  ##
+## ------------ ##
+
+TESTSUITE_AT = \
+ testsuite.at\
+ version.at\
+ info-v1-00.at\
+ info-v2-00.at\
+ info-v12-00.at\
+ set-v1-00.at\
+ set-v2-00.at\
+ query-v1-00.at\
+ query-v1-01.at\
+ query-v2-00.at\
+ query-v2-01.at\
+ query-v2-02.at\
+ query-v2-03.at\
+ query-v2-04.at
+
+TESTSUITE = $(srcdir)/testsuite
+M4=m4
+
+AUTOTEST = $(AUTOM4TE) --language=autotest
+$(TESTSUITE): package.m4 $(TESTSUITE_AT)
+        $(AUTOTEST) -I $(srcdir) testsuite.at -o $@.tmp
+        mv $@.tmp $@