From 68f0ffb29acf5ff07ccd8f30581d96d6915a834e Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Fri, 5 Jun 2009 15:41:05 +0200
Subject: made dynafiles working again

now only stream class is utilized. ttys, pipes and outchannel functionality
is currently disabled. But the testbench worked again. Cleanup needed, will
do this with next commit (it may break things and I like to have this
milestone here).
---
 tests/diag.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/diag.sh b/tests/diag.sh
index 1ceca75b..1fa8f62a 100755
--- a/tests/diag.sh
+++ b/tests/diag.sh
@@ -9,7 +9,7 @@
 #valgrind="valgrind --tool=drd --log-fd=1"
 #valgrind="valgrind --tool=helgrind --log-fd=1"
 #set -o xtrace
-#export RSYSLOG_DEBUG="debug nostdout printmutexaction"
+#export RSYSLOG_DEBUG="debug nostdout noprintmutexaction"
 #export RSYSLOG_DEBUGLOG="log"
 case $1 in
    'init')	$srcdir/killrsyslog.sh # kill rsyslogd if it runs for some reason
@@ -17,6 +17,7 @@ case $1 in
 		rm -f rsyslogd.started work-*.conf
 		rm -f work rsyslog.out.log rsyslog.out.log.save # common work files
 		rm -rf test-spool
+		rm -f core.* vgcore.*
 		mkdir test-spool
 		;;
    'exit')	rm -f rsyslogd.started work-*.conf diag-common.conf
-- 
cgit 


From 9704f129f72ec9ece11aeccea4bbf0cbccb116cb Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Tue, 9 Jun 2009 19:00:18 +0200
Subject: added capability to fsync() queue disk files for enhanced reliability

also adds speed, because you do no longer need to run the whole file
system in sync mode. New testbench and new config directives:
- $MainMsgQueueSyncQueueFiles
- $ActionQueueSyncQueueFiles
---
 tests/Makefile.am                     |  3 +++
 tests/diskqueue-fsync.sh              | 15 +++++++++++++++
 tests/testsuites/diskqueue-fsync.conf | 17 +++++++++++++++++
 3 files changed, 35 insertions(+)
 create mode 100755 tests/diskqueue-fsync.sh
 create mode 100644 tests/testsuites/diskqueue-fsync.conf

(limited to 'tests')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index a95139f2..3d555fc3 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -5,6 +5,7 @@ TESTS = $(TESTRUNS) cfg.sh \
 	validation-run.sh \
 	imtcp-multiport.sh \
 	diskqueue.sh \
+	diskqueue-fsync.sh \
 	manytcp.sh \
 	queue-persist.sh 
 
@@ -59,6 +60,8 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \
 	   fieldtest.sh \
 	   diskqueue.sh \
 	   testsuites/diskqueue.conf \
+	   diskqueue-fsync.sh \
+	   testsuites/diskqueue-fsync.conf \
 	   imtcp-multiport.sh \
 	   testsuites/imtcp-multiport.conf \
 	   manytcp.sh \
diff --git a/tests/diskqueue-fsync.sh b/tests/diskqueue-fsync.sh
new file mode 100755
index 00000000..f558b491
--- /dev/null
+++ b/tests/diskqueue-fsync.sh
@@ -0,0 +1,15 @@
+# Test for disk-only queue mode (with fsync for queue files)
+# This test checks if queue files can be correctly written
+# and read back, but it does not test the transition from
+# memory to disk mode for DA queues.
+# added 2009-06-09 by Rgerhards
+# This file is part of the rsyslog project, released  under GPLv3
+# uncomment for debugging support:
+echo testing queue disk-only mode, fsync case
+source $srcdir/diag.sh init
+source $srcdir/diag.sh startup diskqueue-fsync.conf
+# 5000 messages should be enough - the disk fsync test is very slow!
+source $srcdir/diag.sh tcpflood 127.0.0.1 13514 1 5000
+source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages
+source $srcdir/diag.sh seq-check 0 4999
+source $srcdir/diag.sh exit
diff --git a/tests/testsuites/diskqueue-fsync.conf b/tests/testsuites/diskqueue-fsync.conf
new file mode 100644
index 00000000..0a02c6ce
--- /dev/null
+++ b/tests/testsuites/diskqueue-fsync.conf
@@ -0,0 +1,17 @@
+# Test for queue disk mode (see .sh file for details)
+# rgerhards, 2009-04-17
+$IncludeConfig diag-common.conf
+
+$ModLoad ../plugins/imtcp/.libs/imtcp
+$InputTCPServerRun 13514
+
+# set spool locations and switch queue to disk-only mode
+$WorkDirectory test-spool
+$MainMsgQueueSyncQueueFiles on
+$MainMsgQueueTimeoutShutdown 10000
+$MainMsgQueueFilename mainq
+$MainMsgQueueType disk
+
+$template outfmt,"%msg:F,58:2%\n"
+$template dynfile,"rsyslog.out.log" # trick to use relative path names!
+:msg, contains, "msgnum:" ?dynfile;outfmt
-- 
cgit 


From 6f4e3c4e4c85acdcf58969970484a54639ecc8f9 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Wed, 10 Jun 2009 16:49:14 +0200
Subject: restructered code in perparation for multiple rule set support

... this was long overdue, and I finlly tackeld it. It turned out to
be more complex than I initially thought. The next step now probably is
to actually implement multiple rule sets and the beauty that comes
with them.
---
 tests/diskqueue-fsync.sh | 2 ++
 tests/ourtail.c          | 2 ++
 tests/runtime-dummy.c    | 4 ++++
 tests/validation-run.sh  | 7 ++++---
 4 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'tests')

diff --git a/tests/diskqueue-fsync.sh b/tests/diskqueue-fsync.sh
index f558b491..8d2cb709 100755
--- a/tests/diskqueue-fsync.sh
+++ b/tests/diskqueue-fsync.sh
@@ -5,6 +5,8 @@
 # added 2009-06-09 by Rgerhards
 # This file is part of the rsyslog project, released  under GPLv3
 # uncomment for debugging support:
+echo  diskqueue-fsync test seems to have some issues
+exit 1
 echo testing queue disk-only mode, fsync case
 source $srcdir/diag.sh init
 source $srcdir/diag.sh startup diskqueue-fsync.conf
diff --git a/tests/ourtail.c b/tests/ourtail.c
index 6781b5fe..4e8a6412 100644
--- a/tests/ourtail.c
+++ b/tests/ourtail.c
@@ -40,4 +40,6 @@ int main(int __attribute__((unused)) argc, char __attribute__((unused)) *argv[])
 
 	for( ; c != EOF ; c = getchar())
 		putchar(c);
+
+	return 0;
 }
diff --git a/tests/runtime-dummy.c b/tests/runtime-dummy.c
index 9cddd913..38e6bba1 100644
--- a/tests/runtime-dummy.c
+++ b/tests/runtime-dummy.c
@@ -25,7 +25,9 @@
  *
  * A copy of the GPL can be found in the file "COPYING" in this distribution.
  */
+#include "config.h"
 #include <stdlib.h>
+#include "rsyslog.h"
 
 int bReduceRepeatMsgs = 0;
 int repeatinterval = 30;
@@ -37,5 +39,7 @@ void cflineClassic(void) {};
 void selectorAddList(void) {};
 void selectorConstruct(void) {};
 void selectorDestruct(void) {};
+void getFIOPName(void) {};
 
+ruleset_t *pCurrRuleset;
 /* these are required by some dynamically loaded modules */
diff --git a/tests/validation-run.sh b/tests/validation-run.sh
index 10981290..2e922283 100755
--- a/tests/validation-run.sh
+++ b/tests/validation-run.sh
@@ -22,17 +22,18 @@
 # A copy of the GPL can be found in the file "COPYING" in this distribution.
 #set -x
 echo "testing a failed configuration verification run"
-../tools/rsyslogd -u2 -c3 -N1 -f$srcdir/testsuites/invalid.conf
+../tools/rsyslogd  -dn -u2 -c4 -N1 -f$srcdir/testsuites/invalid.conf -M../runtime/.libs:../.libs
 if [ $? -ne 1 ]; then
    exit 1
 fi
 echo testing a valid config verification run
-../tools/rsyslogd -u2 -c3 -N1 -f$srcdir/testsuites/valid.conf
+../tools/rsyslogd -u2 -c4 -N1 -f$srcdir/testsuites/valid.conf -M../runtime/.libs:../.libs
 if [ $? -ne 0 ]; then
    exit 1
 fi
 echo testing empty config file
-../tools/rsyslogd -u2 -c3 -N1 -f/dev/null
+../tools/rsyslogd -u2 -c4 -N1 -f/dev/null -M../runtime/.libs:../.libs
 if [ $? -ne 1 ]; then
    exit 1
 fi
+echo SUCCESS: validation run tests
-- 
cgit 


From 0290be816e683a711fc3c3a73a2ec79b804cfc8b Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Wed, 10 Jun 2009 16:55:00 +0200
Subject: fixed small nit in build system

---
 tests/Makefile.am | 2 --
 1 file changed, 2 deletions(-)

(limited to 'tests')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3d555fc3..dbaf85f0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -73,8 +73,6 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \
 	   testsuites/1.inputname_imtcp_12516 \
 	   omod-if-array.sh \
 	   diag.sh \
-	   daqueue-persist.sh \
-	   daqueue-persist-drvr.sh \
 	   testsuites/diag-common.conf \
 	   queue-persist.sh \
 	   queue-persist-drvr.sh \
-- 
cgit 


From 6141845f7514622f77d308b7aadb15891d3a627a Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Wed, 10 Jun 2009 18:24:46 +0200
Subject: re-enabled queue disk fsync test

... actually, it was not broken, but just very slow. I have now
reduced the number of test messages so that make check will not be
held for an extended period of time.
---
 tests/diskqueue-fsync.sh | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'tests')

diff --git a/tests/diskqueue-fsync.sh b/tests/diskqueue-fsync.sh
index 8d2cb709..45fb864c 100755
--- a/tests/diskqueue-fsync.sh
+++ b/tests/diskqueue-fsync.sh
@@ -5,13 +5,11 @@
 # added 2009-06-09 by Rgerhards
 # This file is part of the rsyslog project, released  under GPLv3
 # uncomment for debugging support:
-echo  diskqueue-fsync test seems to have some issues
-exit 1
 echo testing queue disk-only mode, fsync case
 source $srcdir/diag.sh init
 source $srcdir/diag.sh startup diskqueue-fsync.conf
-# 5000 messages should be enough - the disk fsync test is very slow!
-source $srcdir/diag.sh tcpflood 127.0.0.1 13514 1 5000
+# 1000 messages should be enough - the disk fsync test is very slow!
+source $srcdir/diag.sh tcpflood 127.0.0.1 13514 1 1000
 source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages
-source $srcdir/diag.sh seq-check 0 4999
+source $srcdir/diag.sh seq-check 0 999
 source $srcdir/diag.sh exit
-- 
cgit 


From 1f874c220860d3a19fb6cfb60f0902a08639f6ab Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Fri, 12 Jun 2009 17:46:16 +0200
Subject: fixed small bug in testbench

---
 tests/diskqueue-fsync.sh | 1 +
 tests/diskqueue.sh       | 1 +
 2 files changed, 2 insertions(+)

(limited to 'tests')

diff --git a/tests/diskqueue-fsync.sh b/tests/diskqueue-fsync.sh
index 45fb864c..0282202d 100755
--- a/tests/diskqueue-fsync.sh
+++ b/tests/diskqueue-fsync.sh
@@ -11,5 +11,6 @@ source $srcdir/diag.sh startup diskqueue-fsync.conf
 # 1000 messages should be enough - the disk fsync test is very slow!
 source $srcdir/diag.sh tcpflood 127.0.0.1 13514 1 1000
 source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages
+source $srcdir/diag.sh wait-shutdown
 source $srcdir/diag.sh seq-check 0 999
 source $srcdir/diag.sh exit
diff --git a/tests/diskqueue.sh b/tests/diskqueue.sh
index 2fe31db9..668a1224 100755
--- a/tests/diskqueue.sh
+++ b/tests/diskqueue.sh
@@ -11,5 +11,6 @@ source $srcdir/diag.sh startup diskqueue.conf
 # 20000 messages should be enough - the disk test is slow enough ;)
 source $srcdir/diag.sh tcpflood 127.0.0.1 13514 1 20000
 source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done processing messages
+source $srcdir/diag.sh wait-shutdown
 source $srcdir/diag.sh seq-check 0 19999
 source $srcdir/diag.sh exit
-- 
cgit 


From d2d54013aebb756169182ed8716b142d27134a70 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Wed, 17 Jun 2009 15:22:13 +0200
Subject: going forward in moving string-handling functions to new interface...

---
 tests/nettester.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/nettester.c b/tests/nettester.c
index 566f553b..b7b3f892 100644
--- a/tests/nettester.c
+++ b/tests/nettester.c
@@ -321,7 +321,9 @@ doTests(int fd, char *files)
 			if(ret == 0) {
 				if(verbose) printf("successfully completed\n");
 			} else {
-				if(verbose) printf("failed!\n");
+				if(!verbose)
+					printf("test '%s' ", testFile);
+				printf("failed!\n");
 				++iFailed;
 			}
 		}
-- 
cgit 


From 8628312396b1535c41124e499d292f4d1e77d955 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Thu, 18 Jun 2009 13:22:21 +0200
Subject: cleaned up/optimized raw message handling in msg object

---
 tests/nettester.c   | 2 +-
 tests/parsertest.sh | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'tests')

diff --git a/tests/nettester.c b/tests/nettester.c
index b7b3f892..e5e6278c 100644
--- a/tests/nettester.c
+++ b/tests/nettester.c
@@ -191,7 +191,7 @@ int openPipe(char *configFile, pid_t *pid, int *pfd)
 	char *newenviron[] = { NULL };
 	/* debug aide...
 	char *newenviron[] = { "RSYSLOG_DEBUG=debug nostdout",
-				"RSYSLOG_DEBUGLOG=tmp", NULL };
+				"RSYSLOG_DEBUGLOG=log", NULL };
 	*/
 
 
diff --git a/tests/parsertest.sh b/tests/parsertest.sh
index afdb9469..8e04b95e 100755
--- a/tests/parsertest.sh
+++ b/tests/parsertest.sh
@@ -1,13 +1,13 @@
 echo test parsertest via udp
 $srcdir/killrsyslog.sh # kill rsyslogd if it runs for some reason
 
-./nettester -tparse1 -iudp
+echo test parsertest via tcp
+./nettester -tparse1 -itcp
 if [ "$?" -ne "0" ]; then
   exit 1
 fi
 
-echo test parsertest via tcp
-./nettester -tparse1 -itcp
+./nettester -tparse1 -iudp
 if [ "$?" -ne "0" ]; then
   exit 1
 fi
-- 
cgit 


From f33dd51c802a8d49839aa73fb9167d8bc31ea912 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Thu, 18 Jun 2009 17:48:11 +0200
Subject: fixed abort condition with oversize tags

this was a regression I introduced this afternoon
---
 tests/Makefile.am                     | 1 +
 tests/testsuites/oversizeTag-1.parse1 | 3 +++
 2 files changed, 4 insertions(+)
 create mode 100644 tests/testsuites/oversizeTag-1.parse1

(limited to 'tests')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index dbaf85f0..0800f667 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -42,6 +42,7 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \
 	   testsuites/1.parse1 \
 	   testsuites/2.parse1 \
 	   testsuites/3.parse1 \
+	   testsuites/oversizeTag-1.parse1 \
 	   testsuites/date1.parse1 \
 	   testsuites/date2.parse1 \
 	   testsuites/date3.parse1 \
diff --git a/tests/testsuites/oversizeTag-1.parse1 b/tests/testsuites/oversizeTag-1.parse1
new file mode 100644
index 00000000..56510c63
--- /dev/null
+++ b/tests/testsuites/oversizeTag-1.parse1
@@ -0,0 +1,3 @@
+<38>Mar 27 19:06:53 source_server 0123456780123456780123456780123456789: MSG part
+38,auth,info,Mar 27 19:06:53,source_server,0123456780123456780123456780123456789,0123456780123456780123456780123456789:, MSG part
+# yet another real-life sample where we had some issues with
-- 
cgit 


From 77c992e2155420702460e835ce2d561cf2d10fcb Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Fri, 19 Jun 2009 11:30:57 +0200
Subject: fully optimized datetime module and enhanced test suite

tests for the various timestamp formats have been added
---
 tests/Makefile.am                 | 22 +++++++++++-
 tests/diag.sh                     |  6 ++++
 tests/nettester.c                 | 70 ++++++++++++++++++++++-----------------
 tests/testsuites/1.retry.conf     |  2 ++
 tests/testsuites/Apr.ts3164       |  3 ++
 tests/testsuites/Aug.ts3164       |  3 ++
 tests/testsuites/Dec.ts3164       |  3 ++
 tests/testsuites/Feb.ts3164       |  3 ++
 tests/testsuites/Jan.ts3164       |  3 ++
 tests/testsuites/Jul.ts3164       |  3 ++
 tests/testsuites/Jun.ts3164       |  3 ++
 tests/testsuites/Mar.ts3164       |  3 ++
 tests/testsuites/May.ts3164       |  3 ++
 tests/testsuites/Nov.ts3164       |  3 ++
 tests/testsuites/Oct.ts3164       |  3 ++
 tests/testsuites/Sep.ts3164       |  3 ++
 tests/testsuites/master.subsecond |  8 +++++
 tests/testsuites/master.ts3339    | 22 ++++++++++++
 tests/testsuites/master.tsmysql   |  2 ++
 tests/testsuites/master.tspgsql   |  2 ++
 tests/testsuites/mon1digit.ts3164 |  3 ++
 tests/testsuites/mon2digit.ts3164 |  3 ++
 tests/testsuites/parse1udp.conf   |  9 +++++
 tests/testsuites/subsecond.conf   |  8 +++++
 tests/testsuites/ts3164.conf      |  8 +++++
 tests/testsuites/ts3339.conf      |  8 +++++
 tests/testsuites/tsmysql.conf     |  8 +++++
 tests/testsuites/tspgsql.conf     |  8 +++++
 tests/timestamp.sh                | 13 ++++++++
 29 files changed, 206 insertions(+), 32 deletions(-)
 create mode 100644 tests/testsuites/1.retry.conf
 create mode 100644 tests/testsuites/Apr.ts3164
 create mode 100644 tests/testsuites/Aug.ts3164
 create mode 100644 tests/testsuites/Dec.ts3164
 create mode 100644 tests/testsuites/Feb.ts3164
 create mode 100644 tests/testsuites/Jan.ts3164
 create mode 100644 tests/testsuites/Jul.ts3164
 create mode 100644 tests/testsuites/Jun.ts3164
 create mode 100644 tests/testsuites/Mar.ts3164
 create mode 100644 tests/testsuites/May.ts3164
 create mode 100644 tests/testsuites/Nov.ts3164
 create mode 100644 tests/testsuites/Oct.ts3164
 create mode 100644 tests/testsuites/Sep.ts3164
 create mode 100644 tests/testsuites/master.subsecond
 create mode 100644 tests/testsuites/master.ts3339
 create mode 100644 tests/testsuites/master.tsmysql
 create mode 100644 tests/testsuites/master.tspgsql
 create mode 100644 tests/testsuites/mon1digit.ts3164
 create mode 100644 tests/testsuites/mon2digit.ts3164
 create mode 100644 tests/testsuites/parse1udp.conf
 create mode 100644 tests/testsuites/subsecond.conf
 create mode 100644 tests/testsuites/ts3164.conf
 create mode 100644 tests/testsuites/ts3339.conf
 create mode 100644 tests/testsuites/tsmysql.conf
 create mode 100644 tests/testsuites/tspgsql.conf
 create mode 100755 tests/timestamp.sh

(limited to 'tests')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0800f667..955ad405 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -10,7 +10,11 @@ TESTS = $(TESTRUNS) cfg.sh \
 	queue-persist.sh 
 
 if ENABLE_OMSTDOUT
-TESTS += omod-if-array.sh parsertest.sh inputname.sh fieldtest.sh
+TESTS += omod-if-array.sh \
+	 parsertest.sh \
+	 timestamp.sh \
+	 inputname.sh \
+	 fieldtest.sh
 endif
 
 endif # if ENABLE_TESTBENCH
@@ -37,6 +41,22 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \
 	   DevNull.cfgtest \
 	   err1.rstest \
 	   NoExistFile.cfgtest \
+	   timestamp.sh \
+	   testsuites/ts3164.conf \
+	   testsuites/mon1digit.ts3164 \
+	   testsuites/mon2digit.ts3164 \
+	   testsuites/Jan.ts3164 \
+	   testsuites/Feb.ts3164 \
+	   testsuites/Mar.ts3164 \
+	   testsuites/Apr.ts3164 \
+	   testsuites/May.ts3164 \
+	   testsuites/Jun.ts3164 \
+	   testsuites/Jul.ts3164 \
+	   testsuites/Aug.ts3164 \
+	   testsuites/Sep.ts3164 \
+	   testsuites/Oct.ts3164 \
+	   testsuites/Nov.ts3164 \
+	   testsuites/Dec.ts3164 \
 	   testsuites/parse1.conf \
 	   testsuites/field1.conf \
 	   testsuites/1.parse1 \
diff --git a/tests/diag.sh b/tests/diag.sh
index 1fa8f62a..2a9d0ee3 100755
--- a/tests/diag.sh
+++ b/tests/diag.sh
@@ -82,5 +82,11 @@ case $1 in
 		  exit 1
 		fi
 		;;
+   'nettester') # perform nettester-based tests
+		./nettester -t$2 -i$3
+		if [ "$?" -ne "0" ]; then
+		  exit 1
+		fi
+		;;
    *)		echo "invalid argument" $1
 esac
diff --git a/tests/nettester.c b/tests/nettester.c
index e5e6278c..b8816b7c 100644
--- a/tests/nettester.c
+++ b/tests/nettester.c
@@ -61,6 +61,9 @@ static int iPort = 12514; /* port which shall be used for sending data */
 static char* pszCustomConf = NULL;	/* custom config file, use -c conf to specify */
 static int verbose = 0;	/* verbose output? -v option */
 
+/* these two are quick hacks... */
+int iFailed = 0;
+int iTests = 0;
 
 /* provide user-friednly name of input mode
  */
@@ -247,38 +250,47 @@ processTestFile(int fd, char *pszFileName)
 
 	/* skip comments at start of file */
 
-	getline(&testdata, &lenLn, fp);
 	while(!feof(fp)) {
-		if(*testdata == '#')
-			getline(&testdata, &lenLn, fp);
-		else
-			break; /* first non-comment */
-	}
+		getline(&testdata, &lenLn, fp);
+		while(!feof(fp)) {
+			if(*testdata == '#')
+				getline(&testdata, &lenLn, fp);
+			else
+				break; /* first non-comment */
+		}
 
+		/* this is not perfect, but works ;) */
+		if(feof(fp))
+			break;
 
-	testdata[strlen(testdata)-1] = '\0'; /* remove \n */
-	/* now we have the test data to send (we could use function pointers here...) */
-	if(inputMode == inputUDP) {
-		if(udpSend(testdata, strlen(testdata)) != 0)
-			return(2);
-	} else {
-		if(tcpSend(testdata, strlen(testdata)) != 0)
-			return(2);
-	}
+		++iTests; /* increment test count, we now do one! */
 
-	/* next line is expected output 
-	 * we do not care about EOF here, this will lead to a failure and thus
-	 * draw enough attention. -- rgerhards, 2009-03-31
-	 */
-	getline(&expected, &lenLn, fp);
-	expected[strlen(expected)-1] = '\0'; /* remove \n */
+		testdata[strlen(testdata)-1] = '\0'; /* remove \n */
+		/* now we have the test data to send (we could use function pointers here...) */
+		if(inputMode == inputUDP) {
+			if(udpSend(testdata, strlen(testdata)) != 0)
+				return(2);
+		} else {
+			if(tcpSend(testdata, strlen(testdata)) != 0)
+				return(2);
+		}
+
+		/* next line is expected output 
+		 * we do not care about EOF here, this will lead to a failure and thus
+		 * draw enough attention. -- rgerhards, 2009-03-31
+		 */
+		getline(&expected, &lenLn, fp);
+		expected[strlen(expected)-1] = '\0'; /* remove \n */
+
+		/* pull response from server and then check if it meets our expectation */
+		readLine(fd, buf);
+		if(strcmp(expected, buf)) {
+			++iFailed;
+			printf("\nExpected Response:\n'%s'\nActual Response:\n'%s'\n",
+				expected, buf);
+				ret = 1;
+		}
 
-	/* pull response from server and then check if it meets our expectation */
-	readLine(fd, buf);
-	if(strcmp(expected, buf)) {
-		printf("\nExpected Response:\n'%s'\nActual Response:\n'%s'\n",
-			expected, buf);
-			ret = 1;
 	}
 
 	free(testdata);
@@ -297,8 +309,6 @@ processTestFile(int fd, char *pszFileName)
 int
 doTests(int fd, char *files)
 {
-	int iFailed = 0;
-	int iTests = 0;
 	int ret;
 	char *testFile;
 	glob_t testFiles;
@@ -313,7 +323,6 @@ doTests(int fd, char *files)
 		if(stat((char*) testFile, &fileInfo) != 0) 
 			continue; /* continue with the next file if we can't stat() the file */
 
-		++iTests;
 		/* all regular files are run through the test logic. Symlinks don't work. */
 		if(S_ISREG(fileInfo.st_mode)) { /* config file */
 			if(verbose) printf("processing test case '%s' ... ", testFile);
@@ -324,7 +333,6 @@ doTests(int fd, char *files)
 				if(!verbose)
 					printf("test '%s' ", testFile);
 				printf("failed!\n");
-				++iFailed;
 			}
 		}
 	}
diff --git a/tests/testsuites/1.retry.conf b/tests/testsuites/1.retry.conf
new file mode 100644
index 00000000..c464b19c
--- /dev/null
+++ b/tests/testsuites/1.retry.conf
@@ -0,0 +1,2 @@
+<167>Mar  6 16:57:54 172.20.245.8 %PIX-7-710005: UDP request discarded from SERVER1/2741 to test_app:255.255.255.255/61601
+167,Mar  6 16:57:54,172.20.245.8,%PIX-7-710005,%PIX-7-710005:,
diff --git a/tests/testsuites/Apr.ts3164 b/tests/testsuites/Apr.ts3164
new file mode 100644
index 00000000..3134f224
--- /dev/null
+++ b/tests/testsuites/Apr.ts3164
@@ -0,0 +1,3 @@
+<167>Apr  6 16:57:54 172.20.245.8 TAG: MSG
+Apr  6 16:57:54
+#Only the first two lines are important, you may place anything behind them!
diff --git a/tests/testsuites/Aug.ts3164 b/tests/testsuites/Aug.ts3164
new file mode 100644
index 00000000..d9a721eb
--- /dev/null
+++ b/tests/testsuites/Aug.ts3164
@@ -0,0 +1,3 @@
+<167>Aug  6 16:57:54 172.20.245.8 TAG: MSG
+Aug  6 16:57:54
+#Only the first two lines are important, you may place anything behind them!
diff --git a/tests/testsuites/Dec.ts3164 b/tests/testsuites/Dec.ts3164
new file mode 100644
index 00000000..080ba401
--- /dev/null
+++ b/tests/testsuites/Dec.ts3164
@@ -0,0 +1,3 @@
+<167>Dec  6 16:57:54 172.20.245.8 TAG: MSG
+Dec  6 16:57:54
+#Only the first two lines are important, you may place anything behind them!
diff --git a/tests/testsuites/Feb.ts3164 b/tests/testsuites/Feb.ts3164
new file mode 100644
index 00000000..d1eaaa33
--- /dev/null
+++ b/tests/testsuites/Feb.ts3164
@@ -0,0 +1,3 @@
+<167>Feb  6 16:57:54 172.20.245.8 TAG: MSG
+Feb  6 16:57:54
+#Only the first two lines are important, you may place anything behind them!
diff --git a/tests/testsuites/Jan.ts3164 b/tests/testsuites/Jan.ts3164
new file mode 100644
index 00000000..0cb1c8e2
--- /dev/null
+++ b/tests/testsuites/Jan.ts3164
@@ -0,0 +1,3 @@
+<167>Jan  6 16:57:54 172.20.245.8 TAG: MSG
+Jan  6 16:57:54
+#Only the first two lines are important, you may place anything behind them!
diff --git a/tests/testsuites/Jul.ts3164 b/tests/testsuites/Jul.ts3164
new file mode 100644
index 00000000..562e1ec4
--- /dev/null
+++ b/tests/testsuites/Jul.ts3164
@@ -0,0 +1,3 @@
+<167>Jul  6 16:57:54 172.20.245.8 TAG: MSG
+Jul  6 16:57:54
+#Only the first two lines are important, you may place anything behind them!
diff --git a/tests/testsuites/Jun.ts3164 b/tests/testsuites/Jun.ts3164
new file mode 100644
index 00000000..ede27e0e
--- /dev/null
+++ b/tests/testsuites/Jun.ts3164
@@ -0,0 +1,3 @@
+<167>Jun  6 16:57:54 172.20.245.8 TAG: MSG
+Jun  6 16:57:54
+#Only the first two lines are important, you may place anything behind them!
diff --git a/tests/testsuites/Mar.ts3164 b/tests/testsuites/Mar.ts3164
new file mode 100644
index 00000000..55dd5bc2
--- /dev/null
+++ b/tests/testsuites/Mar.ts3164
@@ -0,0 +1,3 @@
+<167>Mar  6 16:57:54 172.20.245.8 TAG: MSG
+Mar  6 16:57:54
+#Only the first two lines are important, you may place anything behind them!
diff --git a/tests/testsuites/May.ts3164 b/tests/testsuites/May.ts3164
new file mode 100644
index 00000000..72a5a301
--- /dev/null
+++ b/tests/testsuites/May.ts3164
@@ -0,0 +1,3 @@
+<167>May  6 16:57:54 172.20.245.8 TAG: MSG
+May  6 16:57:54
+#Only the first two lines are important, you may place anything behind them!
diff --git a/tests/testsuites/Nov.ts3164 b/tests/testsuites/Nov.ts3164
new file mode 100644
index 00000000..e8f00e01
--- /dev/null
+++ b/tests/testsuites/Nov.ts3164
@@ -0,0 +1,3 @@
+<167>Nov  6 16:57:54 172.20.245.8 TAG: MSG
+Nov  6 16:57:54
+#Only the first two lines are important, you may place anything behind them!
diff --git a/tests/testsuites/Oct.ts3164 b/tests/testsuites/Oct.ts3164
new file mode 100644
index 00000000..01423fef
--- /dev/null
+++ b/tests/testsuites/Oct.ts3164
@@ -0,0 +1,3 @@
+<167>Oct  6 16:57:54 172.20.245.8 TAG: MSG
+Oct  6 16:57:54
+#Only the first two lines are important, you may place anything behind them!
diff --git a/tests/testsuites/Sep.ts3164 b/tests/testsuites/Sep.ts3164
new file mode 100644
index 00000000..6c9e48e0
--- /dev/null
+++ b/tests/testsuites/Sep.ts3164
@@ -0,0 +1,3 @@
+<167>Sep  6 16:57:54 172.20.245.8 TAG: MSG
+Sep  6 16:57:54
+#Only the first two lines are important, you may place anything behind them!
diff --git a/tests/testsuites/master.subsecond b/tests/testsuites/master.subsecond
new file mode 100644
index 00000000..ee924877
--- /dev/null
+++ b/tests/testsuites/master.subsecond
@@ -0,0 +1,8 @@
+<34>1 2003-01-23T12:34:56.003Z mymachine.example.com su - ID47 - MSG
+003
+# full precision
+<34>1 2003-01-23T12:34:56.123456Z mymachine.example.com su - ID47 - MSG
+123456
+# without
+<34>1 2003-01-23T12:34:56Z mymachine.example.com su - ID47 - MSG
+0
diff --git a/tests/testsuites/master.ts3339 b/tests/testsuites/master.ts3339
new file mode 100644
index 00000000..b4dd5f39
--- /dev/null
+++ b/tests/testsuites/master.ts3339
@@ -0,0 +1,22 @@
+<34>1 2003-11-11T22:14:15.003Z mymachine.example.com su - ID47 - MSG
+2003-11-11T22:14:15.003Z
+# next test
+<34>1 2003-01-11T22:14:15.003Z mymachine.example.com su - ID47 - MSG
+2003-01-11T22:14:15.003Z
+# next test
+<34>1 2003-11-01T22:04:15.003Z mymachine.example.com su - ID47 - MSG
+2003-11-01T22:04:15.003Z
+# next test
+<34>1 2003-11-11T02:14:15.003Z mymachine.example.com su - ID47 - MSG
+2003-11-11T02:14:15.003Z
+# next test
+<34>1 2003-11-11T22:04:05.003Z mymachine.example.com su - ID47 - MSG
+2003-11-11T22:04:05.003Z
+# next test
+<34>1 2003-11-11T22:04:05.003+02:00 mymachine.example.com su - ID47 - MSG
+2003-11-11T22:04:05.003+02:00
+# next test
+<34>1 2003-11-11T22:04:05.003+01:30 mymachine.example.com su - ID47 - MSG
+2003-11-11T22:04:05.003+01:30
+<34>1 2003-11-11T22:04:05.123456+01:30 mymachine.example.com su - ID47 - MSG
+2003-11-11T22:04:05.123456+01:30
diff --git a/tests/testsuites/master.tsmysql b/tests/testsuites/master.tsmysql
new file mode 100644
index 00000000..dc6d85be
--- /dev/null
+++ b/tests/testsuites/master.tsmysql
@@ -0,0 +1,2 @@
+<34>1 2003-01-23T12:34:56.003Z mymachine.example.com su - ID47 - MSG
+20030123123456
diff --git a/tests/testsuites/master.tspgsql b/tests/testsuites/master.tspgsql
new file mode 100644
index 00000000..d7ac19ff
--- /dev/null
+++ b/tests/testsuites/master.tspgsql
@@ -0,0 +1,2 @@
+<34>1 2003-01-23T12:34:56.003Z mymachine.example.com su - ID47 - MSG
+2003-01-23 12:34:56
diff --git a/tests/testsuites/mon1digit.ts3164 b/tests/testsuites/mon1digit.ts3164
new file mode 100644
index 00000000..0cb1c8e2
--- /dev/null
+++ b/tests/testsuites/mon1digit.ts3164
@@ -0,0 +1,3 @@
+<167>Jan  6 16:57:54 172.20.245.8 TAG: MSG
+Jan  6 16:57:54
+#Only the first two lines are important, you may place anything behind them!
diff --git a/tests/testsuites/mon2digit.ts3164 b/tests/testsuites/mon2digit.ts3164
new file mode 100644
index 00000000..9606961c
--- /dev/null
+++ b/tests/testsuites/mon2digit.ts3164
@@ -0,0 +1,3 @@
+<167>Jan 16 16:57:54 172.20.245.8 TAG: MSG
+Jan 16 16:57:54
+#Only the first two lines are important, you may place anything behind them!
diff --git a/tests/testsuites/parse1udp.conf b/tests/testsuites/parse1udp.conf
new file mode 100644
index 00000000..0fb7d16d
--- /dev/null
+++ b/tests/testsuites/parse1udp.conf
@@ -0,0 +1,9 @@
+$ModLoad ../plugins/omstdout/.libs/omstdout
+$ModLoad ../plugins/imudp/.libs/imudp
+$UDPServerRun 12514
+
+$ErrorMessagesToStderr off
+
+# use a special format that we can easily parse in expect
+$template expect,"%PRI%,%syslogfacility-text%,%syslogseverity-text%,%timestamp%,%hostname%,%programname%,%syslogtag%,%msg%\n"
+*.* :omstdout:;expect
diff --git a/tests/testsuites/subsecond.conf b/tests/testsuites/subsecond.conf
new file mode 100644
index 00000000..58c26cc7
--- /dev/null
+++ b/tests/testsuites/subsecond.conf
@@ -0,0 +1,8 @@
+$ModLoad ../plugins/omstdout/.libs/omstdout
+$IncludeConfig nettest.input.conf	# This picks the to be tested input from the test driver!
+
+$ErrorMessagesToStderr off
+
+# use a special format
+$template fmt,"%timestamp:::date-subseconds%\n"
+*.* :omstdout:;fmt
diff --git a/tests/testsuites/ts3164.conf b/tests/testsuites/ts3164.conf
new file mode 100644
index 00000000..7aa6a8ef
--- /dev/null
+++ b/tests/testsuites/ts3164.conf
@@ -0,0 +1,8 @@
+$ModLoad ../plugins/omstdout/.libs/omstdout
+$IncludeConfig nettest.input.conf	# This picks the to be tested input from the test driver!
+
+$ErrorMessagesToStderr off
+
+# use a special format
+$template fmt,"%timestamp:::date-rfc3164%\n"
+*.* :omstdout:;fmt
diff --git a/tests/testsuites/ts3339.conf b/tests/testsuites/ts3339.conf
new file mode 100644
index 00000000..df8f23ac
--- /dev/null
+++ b/tests/testsuites/ts3339.conf
@@ -0,0 +1,8 @@
+$ModLoad ../plugins/omstdout/.libs/omstdout
+$IncludeConfig nettest.input.conf	# This picks the to be tested input from the test driver!
+
+$ErrorMessagesToStderr off
+
+# use a special format
+$template fmt,"%timestamp:::date-rfc3339%\n"
+*.* :omstdout:;fmt
diff --git a/tests/testsuites/tsmysql.conf b/tests/testsuites/tsmysql.conf
new file mode 100644
index 00000000..f97d4b0a
--- /dev/null
+++ b/tests/testsuites/tsmysql.conf
@@ -0,0 +1,8 @@
+$ModLoad ../plugins/omstdout/.libs/omstdout
+$IncludeConfig nettest.input.conf	# This picks the to be tested input from the test driver!
+
+$ErrorMessagesToStderr off
+
+# use a special format
+$template fmt,"%timestamp:::date-mysql%\n"
+*.* :omstdout:;fmt
diff --git a/tests/testsuites/tspgsql.conf b/tests/testsuites/tspgsql.conf
new file mode 100644
index 00000000..eb18c091
--- /dev/null
+++ b/tests/testsuites/tspgsql.conf
@@ -0,0 +1,8 @@
+$ModLoad ../plugins/omstdout/.libs/omstdout
+$IncludeConfig nettest.input.conf	# This picks the to be tested input from the test driver!
+
+$ErrorMessagesToStderr off
+
+# use a special format
+$template fmt,"%timestamp:::date-pgsql%\n"
+*.* :omstdout:;fmt
diff --git a/tests/timestamp.sh b/tests/timestamp.sh
new file mode 100755
index 00000000..7699a4af
--- /dev/null
+++ b/tests/timestamp.sh
@@ -0,0 +1,13 @@
+echo various timestamp tests
+source $srcdir/diag.sh init
+source $srcdir/diag.sh nettester ts3164 udp
+source $srcdir/diag.sh nettester ts3164 tcp
+source $srcdir/diag.sh nettester ts3339 udp
+source $srcdir/diag.sh nettester ts3339 tcp
+source $srcdir/diag.sh nettester tsmysql udp
+source $srcdir/diag.sh nettester tsmysql tcp
+source $srcdir/diag.sh nettester tspgsql udp
+source $srcdir/diag.sh nettester tspgsql tcp
+source $srcdir/diag.sh nettester subsecond udp
+source $srcdir/diag.sh nettester subsecond tcp
+source $srcdir/diag.sh init
-- 
cgit 


From 11cb1e008bfb932a159cc746c5d435ae9518ed19 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Fri, 19 Jun 2009 11:45:21 +0200
Subject: some cleanup

---
 tests/Makefile.am | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'tests')

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 955ad405..4d38f875 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -57,6 +57,14 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \
 	   testsuites/Oct.ts3164 \
 	   testsuites/Nov.ts3164 \
 	   testsuites/Dec.ts3164 \
+	   testsuites/ts3339.conf \
+	   testsuites/master.ts3339 \
+	   testsuites/tsmysql.conf \
+	   testsuites/master.tsmysql \
+	   testsuites/tspgsql.conf \
+	   testsuites/master.tspgsql \
+	   testsuites/subsecond.conf \
+	   testsuites/master.subsecond \
 	   testsuites/parse1.conf \
 	   testsuites/field1.conf \
 	   testsuites/1.parse1 \
-- 
cgit 


From b2fa740b9ab5fb9e85309b3307f3fca21f625ab1 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Tue, 23 Jun 2009 17:14:42 +0200
Subject: optimized TAG handling

---
 tests/diskqueue.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/diskqueue.sh b/tests/diskqueue.sh
index 668a1224..d2e75cbd 100755
--- a/tests/diskqueue.sh
+++ b/tests/diskqueue.sh
@@ -5,7 +5,7 @@
 # added 2009-04-17 by Rgerhards
 # This file is part of the rsyslog project, released  under GPLv3
 # uncomment for debugging support:
-echo testing queue disk-only mode
+echo diskqueue.sh: testing queue disk-only mode
 source $srcdir/diag.sh init
 source $srcdir/diag.sh startup diskqueue.conf
 # 20000 messages should be enough - the disk test is slow enough ;)
-- 
cgit