summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/Makefile.am10
-rw-r--r--tests/parser.tcl78
-rwxr-xr-xtests/parsertest2
-rw-r--r--tests/parsertest.c265
-rw-r--r--tests/testruns/rfc5424-1.parse13
5 files changed, 270 insertions, 88 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index f22ca139..f941f3a6 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,12 +1,10 @@
-check_PROGRAMS = rt_init rscript
-TESTS = $(check_PROGRAMS) cfg.sh parsertest
+check_PROGRAMS = rt_init rscript parsertest
+TESTS = $(check_PROGRAMS) cfg.sh
TESTS_ENVIRONMENT = RSYSLOG_MODDIR='$(abs_top_builddir)'/runtime/.libs/
DISTCLEANFILES=rsyslog.pid
test_files = testbench.h runtime-dummy.c
-EXTRA_DIST=parser.tcl \
- 1.rstest 2.rstest 3.rstest err1.rstest \
- cfg.sh \
+EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \
cfg1.cfgtest \
cfg1.testin \
cfg2.cfgtest \
@@ -25,7 +23,7 @@ EXTRA_DIST=parser.tcl \
testruns/rfc5424-2.parse1 \
testruns/rfc5424-3.parse1 \
testruns/rfc5424-4.parse1 \
- parsertest
+ cfg.sh
rt_init_SOURCES = rt-init.c $(test_files)
rt_init_CPPFLAGS = -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
diff --git a/tests/parser.tcl b/tests/parser.tcl
deleted file mode 100644
index 1adeac25..00000000
--- a/tests/parser.tcl
+++ /dev/null
@@ -1,78 +0,0 @@
-# rsyslog parser tests
-# This is a first version, and can be extended and improved for
-# sure. But it is far better than nothing. Please note that this
-# script works together with the config file AND easily extensible
-# test case files (*.parse1) to run a number of checks. All test
-# cases are executed, even if there is a failure early in the
-# process. When finished, the numberof failed tests will be given.
-#
-# Note: a lot of things are not elegant, but at least they work...
-# Even simple things seem to be somewhat non-simple if you are
-# not sufficiently involved with tcl/expect ;) -- rgerhards
-#
-# call: tclsh parser.tcl /director/with/testcases
-#
-# Copyright (C) 2009 by Rainer Gerhards and Adiscon GmbH
-#
-# This file is part of rsyslog.
-
-package require Expect
-package require udp 1.0
-log_user 0; # comment this out if you would like to see rsyslog output for testing
-
-if {$argc > 1} {
- puts "invalid number of parameters, usage: tclsh parser.tcl /directory/with/testcases";
- exit 1;
-}
-if {$argc == 0 } {
- set srcdir ".";
-} else {
- set srcdir "$argv";
-}
-
-set rsyslogdPID [spawn "../tools/rsyslogd" "-c4" "-f$srcdir/testruns/parser.conf" "-u2" "-n" "-irsyslog.pid" "-M../runtime/.libs"];
-#interact;
-expect "}}"; # eat startup message
-set udpSock [udp_open];
-udp_conf $udpSock 127.0.0.1 12514
-set files [glob "$srcdir/testruns/*.parse1"]
-set failed 0;
-puts "\nExecuting parser test suite...";
-
-set i 0;
-
-foreach testcase $files {
- puts "testing $testcase";
- set fp [open "$testcase" r];
- fconfigure $fp -buffering line
- gets $fp input
- gets $fp expected
- # assemble "expected" to match the template we use
- close $fp;
-
- # send to daemon
- puts $udpSock $input;
- flush $udpSock;
-
- # get response and compare
- expect -re "{{.*}}";
-
- set result $expect_out(buffer);
- set result [string trimleft $result "\{\{"];
- set result [string trimright $result "\}\}"];
-
- if { $result != $expected } {
- puts "failed!";
- puts "expected: '$expected'\n";
- puts "returned: '$result'\n";
- puts "\n";
- set failed [expr {$failed + 1}];
- };
- set i [expr {$i + 1}];
-}
-
-exec kill $rsyslogdPID;
-close $udpSock;
-
-puts "Total number of tests: $i, number of failed tests: $failed.\n";
-if { $failed != 0 } { exit 1 };
diff --git a/tests/parsertest b/tests/parsertest
deleted file mode 100755
index c7efa631..00000000
--- a/tests/parsertest
+++ /dev/null
@@ -1,2 +0,0 @@
-# run parser test suite
-tclsh $srcdir/parser.tcl $srcdir
diff --git a/tests/parsertest.c b/tests/parsertest.c
new file mode 100644
index 00000000..3ccae3d6
--- /dev/null
+++ b/tests/parsertest.c
@@ -0,0 +1,265 @@
+/* Runs a test suite on the rsyslog parser (and later potentially
+ * other things).
+ *
+ * Please note that this
+ * program works together with the config file AND easily extensible
+ * test case files (*.parse1) to run a number of checks. All test
+ * cases are executed, even if there is a failure early in the
+ * process. When finished, the numberof failed tests will be given.
+ *
+ * Part of the testbench for rsyslog.
+ *
+ * Copyright 2009 Rainer Gerhards and Adiscon GmbH.
+ *
+ * This file is part of rsyslog.
+ *
+ * Rsyslog 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 of the License, or
+ * (at your option) any later version.
+ *
+ * Rsyslog 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 Rsyslog. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * A copy of the GPL can be found in the file "COPYING" in this distribution.
+ */
+#include "config.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/wait.h>
+#include <sys/stat.h>
+#include <arpa/inet.h>
+#include <assert.h>
+#include <unistd.h>
+#include <string.h>
+#include <glob.h>
+#include <netinet/in.h>
+
+#define EXIT_FAILURE 1
+
+
+void readLine(int fd, char *ln)
+{
+ char c;
+ int lenRead;
+ lenRead = read(fd, &c, 1);
+ while(lenRead == 1 && c != '\n') {
+ *ln++ = c;
+ lenRead = read(fd, &c, 1);
+ }
+ *ln = '\0';
+}
+
+
+/* send a message via UDP
+ * returns 0 if ok, something else otherwise.
+ */
+int
+udpSend(char *buf, int lenBuf)
+{
+ struct sockaddr_in si_other;
+ int s, slen=sizeof(si_other);
+
+ if((s=socket(AF_INET, SOCK_DGRAM, 0))==-1) {
+ perror("socket()");
+ return(1);
+ }
+
+ memset((char *) &si_other, 0, sizeof(si_other));
+ si_other.sin_family = AF_INET;
+ si_other.sin_port = htons(12514);
+ if(inet_aton("127.0.0.1", &si_other.sin_addr)==0) {
+ fprintf(stderr, "inet_aton() failed\n");
+ return(1);
+ }
+
+ if(sendto(s, buf, lenBuf, 0, (struct sockaddr*) &si_other, slen)==-1) {
+ perror("sendto");
+ fprintf(stderr, "sendto() failed\n");
+ return(1);
+ }
+
+ close(s);
+ return 0;
+}
+
+/* open pipe to test candidate - so far, this is
+ * always rsyslogd and with a fixed config. Later, we may
+ * change this. Returns 0 if ok, something else otherwise.
+ * rgerhards, 2009-03-31
+ */
+int openPipe(pid_t *pid, int *pfd)
+{
+ int pipefd[2];
+ pid_t cpid;
+ char *newargv[] = {"../tools/rsyslogd", "dummy", "-c4", "-u2", "-n", "-irsyslog.pid",
+ "-M../runtime//.libs", NULL };
+ char confFile[1024];
+ char *newenviron[] = { NULL };
+
+
+ sprintf(confFile, "-f%s/testruns/parser2.conf", getenv("srcdir"));
+ newargv[1] = confFile;
+
+ if (pipe(pipefd) == -1) {
+ perror("pipe");
+ exit(EXIT_FAILURE);
+ }
+
+ cpid = fork();
+ if (cpid == -1) {
+ perror("fork");
+ exit(EXIT_FAILURE);
+ }
+
+ if(cpid == 0) { /* Child reads from pipe */
+ fclose(stdout);
+ dup(pipefd[1]);
+ close(pipefd[1]);
+ close(pipefd[0]);
+ fclose(stdin);
+ execve("../tools/rsyslogd", newargv, newenviron);
+ } else {
+ close(pipefd[1]);
+ *pid = cpid;
+ *pfd = pipefd[0];
+ }
+
+ return(0);
+}
+
+
+/* Process a specific test case. File name is provided.
+ * Needs to return 0 if all is OK, something else otherwise.
+ */
+int
+processTestFile(int fd, char *pszFileName)
+{
+ FILE *fp;
+ char *testdata = NULL;
+ char *expected = NULL;
+ int ret = 0;
+ size_t lenLn;
+ char buf[4096];
+
+ if((fp = fopen((char*)pszFileName, "r")) == NULL) {
+ perror((char*)pszFileName);
+ return(2);
+ }
+
+ /* skip comments at start of file */
+
+ getline(&testdata, &lenLn, fp);
+ while(!feof(fp)) {
+ if(*testdata == '#')
+ getline(&testdata, &lenLn, fp);
+ else
+ break; /* first non-comment */
+ }
+
+
+ testdata[strlen(testdata)-1] = '\0'; /* remove \n */
+ /* now we have the test data to send */
+ if(udpSend(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)) {
+ printf("\nExpected Response:\n'%s'\nActual Response:\n'%s'\n",
+ expected, buf);
+ ret = 1;
+ }
+
+ free(testdata);
+ free(expected);
+ fclose(fp);
+ return(ret);
+}
+
+
+/* carry out all tests. Tests are specified via a file name
+ * wildcard. Each of the files is read and the test carried
+ * out.
+ * Returns the number of tests that failed. Zero means all
+ * success.
+ */
+int
+doTests(int fd, char *files)
+{
+ int iFailed = 0;
+ int iTests = 0;
+ int ret;
+ char *testFile;
+ glob_t testFiles;
+ size_t i = 0;
+ struct stat fileInfo;
+
+ glob(files, GLOB_MARK, NULL, &testFiles);
+
+ for(i = 0; i < testFiles.gl_pathc; i++) {
+ testFile = testFiles.gl_pathv[i];
+
+ 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 */
+ printf("processing test case '%s' ... ", testFile);
+ ret = processTestFile(fd, testFile);
+ if(ret == 0) {
+ printf("successfully completed\n");
+ } else {
+ printf("failed!\n");
+ ++iFailed;
+ }
+ }
+ }
+ globfree(&testFiles);
+
+ printf("Number of tests run: %d, number of failures: %d\n", iTests, iFailed);
+ return(iFailed);
+}
+
+
+/* */
+int main(int argc, char *argv[])
+{
+ int fd;
+ pid_t pid;
+ int ret = 0;
+ char buf[4096];
+ char testcases[4096];
+
+ printf("running rsyslog parser tests ($srcdir=%s)\n", getenv("srcdir"));
+
+ openPipe(&pid, &fd);
+ readLine(fd, buf);
+
+ /* generate filename */
+ sprintf(testcases, "%s/testruns/*.parse1", getenv("srcdir"));
+ if(doTests(fd, testcases) != 0)
+ ret = 1;
+
+ /* cleanup */
+ kill(pid, SIGTERM);
+ printf("End of parser tests.\n");
+ exit(ret);
+}
+
+
diff --git a/tests/testruns/rfc5424-1.parse1 b/tests/testruns/rfc5424-1.parse1
index 90236c7f..23836c9f 100644
--- a/tests/testruns/rfc5424-1.parse1
+++ b/tests/testruns/rfc5424-1.parse1
@@ -1,4 +1,3 @@
+#Example from RFC5424, section 6.5 / sample 1
<34>1 2003-10-11T22:14:15.003Z mymachine.example.com su - ID47 - BOM'su root' failed for lonvick on /dev/pts/8
34,auth,crit,Oct 11 22:14:15,mymachine.example.com,,su,- BOM'su root' failed for lonvick on /dev/pts/8
-#Example from RFC5424, section 6.5 / sample 1
-#Only the first two lines are important, you may place anything behind them!