Add testsuite.

10 files changed, 300 insertions, 8 deletions

diff --git a/Makefile.am b/Makefile.am
index 221d1c0..d11b042 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,16 +9,16 @@
 # Vmod-binlog 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 vmod-sql.  If not, see <http://www.gnu.org/licenses/>.
+# along with vmod-binlog.  If not, see <http://www.gnu.org/licenses/>.
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = src #doc tests
+SUBDIRS = src tests #doc
 
 EXTRA_DIST=git2chg.awk
 
 .PHONY: ChangeLog
 ChangeLog:
         $(AM_V_GEN)if test -d .git; then                                   \
diff --git a/configure.ac b/configure.ac
index 2924eae..ea7c061 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,13 +9,13 @@
 # Vmod-binlog 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 vmod-sql.  If not, see <http://www.gnu.org/licenses/>.
+# along with vmod-binlog.  If not, see <http://www.gnu.org/licenses/>.
 AC_PREREQ(2.69)
 AC_INIT([vmod-binlog], 1.0, [gray@gnu.org])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR(src/binlog.c)
 AM_CONFIG_HEADER(config.h)
@@ -93,13 +93,17 @@ AC_ARG_WITH([vmod-dir],
    esac])
 
 if test -z "$VMODDIR"; then
        VMODDIR='$(libdir)/varnish/mods'
 fi
 
-dnl FIXME:      tests/Makefile
+# Initialize the test suite.
+AC_CONFIG_TESTDIR(tests)
+AC_CONFIG_FILES([tests/Makefile tests/atlocal])
+AM_MISSING_PROG([AUTOM4TE], [autom4te])
+
 dnl FIXME:      doc/Makefile
 AC_CONFIG_FILES([
         Makefile
         src/Makefile
 ])
 AC_OUTPUT
diff --git a/src/binlog.c b/src/binlog.c
index f896803..be32e10 100644
--- a/src/binlog.c
+++ b/src/binlog.c
@@ -449,13 +449,13 @@ vmod_append(struct sess *sp, struct vmod_priv *priv, int nid, int aid)
         time_t ts;
 
         if (!conf)
                 return;
 
         ts = time(NULL);
-        
+
         if (ts >= conf->stoptime) {
                 AZ(pthread_mutex_lock(&conf->mutex));
                 closefile(sp, conf);
                 newfile(sp, conf);
                 AZ(pthread_mutex_unlock(&conf->mutex));
         }
diff --git a/src/binlogcat.c b/src/binlogcat.c
index c51125b..219f78c 100644
--- a/src/binlogcat.c
+++ b/src/binlogcat.c
@@ -25,22 +25,24 @@
 #include "vmod-binlog.h"
 
 char *progname;
 char *timefmt = "%c";
 int number_option;
 int verbose_option;
+int timediff_option;
 
 void
 catlog(const char *fname)
 {
         FILE *fp;
         union binlog_header header;
         struct binlog_record rec;
         char timebuf[128];
         size_t i;
-                
+        time_t start_ts;
+        
         if (strcmp(fname, "-") == 0)
                 fp = stdin;
         else {
                 fp = fopen(fname, "r");
                 if (!fp) {
                         fprintf(stderr, "%s: cannot open %s: %s\n",
@@ -80,35 +82,45 @@ catlog(const char *fname)
                 if (fread(&rec, sizeof(rec), 1, fp) != 1) {
                         fprintf(stderr, "%s: %s: unexpected eof\n",
                                 progname, fname);
                         break;
                 }
 
+                if (timediff_option) {
+                        if (i == 0)
+                                start_ts = rec.ts;
+                        rec.ts -= start_ts;
+                }
+                
                 strftime(timebuf, sizeof timebuf, timefmt, localtime(&rec.ts));
                 if (number_option)
                         printf("%lu ", (unsigned long) i);
                 printf("%s %ld %ld\n", timebuf, rec.nid, rec.aid);
         }
         
         fclose(fp);
 }
 
 void
 help()
 {
-        printf("usage: %s [-hnv] [t FORMAT] [FILE...]\n");
+        printf("usage: %s [-dhnv] [t FORMAT] [FILE...]\n");
 }
 
 int
 main(int argc, char **argv)
 {
         progname = argv[0];
         int c;
         
-        while ((c = getopt(argc, argv, "ht:nv")) != EOF)
+        while ((c = getopt(argc, argv, "dht:nv")) != EOF)
                 switch (c) {
+                case 'd':
+                        timediff_option = 1;
+                        timefmt = "%s";
+                        break;
                 case 'h':
                         help();
                         return 0;
                 case 't':
                         timefmt = optarg;
                         break;
diff --git a/tests/.gitignore b/tests/.gitignore
new file mode 100644
index 0000000..93f8f46
--- /dev/null
+++ b/tests/.gitignore
@@ -0,0 +1,6 @@
+atconfig
+atlocal
+package.m4
+testsuite
+testsuite.dir
+testsuite.log
diff --git a/tests/Makefile.am b/tests/Makefile.am
new file mode 100644
index 0000000..7f24aeb
--- /dev/null
+++ b/tests/Makefile.am
@@ -0,0 +1,71 @@
+# This file is part of vmod-binlog
+# Copyright (C) 2013 Sergey Poznyakoff
+#
+# Vmod-binlog 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.
+#
+# Vmod-binlog 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