rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-15 10:30:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed a couple of nits with "make [dist]check"

Browse Source
This commit is contained in:
Rainer Gerhards 2009-03-27 16:09:45 +01:00
parent 47fb9cb807
commit 5813611215
5 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Makefile.am
View File

@ -17,12 +17,14 @@ EXTRA_DIST=parser.tcl \
DevNull.cfgtest \
err1.rstest \
NoExistFile.cfgtest \
testruns/parser.conf \
testruns/1.parse1 \
testruns/rfc3164.parse1 \
testruns/rfc5424-1.parse1 \
testruns/rfc5424-2.parse1 \
testruns/rfc5424-3.parse1 \
testruns/rfc5424-4.parse1 \
work/dummy \
parsertest
rt_init_SOURCES = rt-init.c $(test_files)

16
tests/parser.tcl
View File

@ -9,6 +9,8 @@
# 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
#
@ -18,12 +20,22 @@ package require Expect
package require udp 1.0
log_user 0; # comment this out if you would like to see rsyslog output for testing
set rsyslogdPID [spawn "../tools/rsyslogd" "-c4" "-ftestruns/parser.conf" "-u2" "-n" "-iwork/rsyslog.pid" "-M../runtime/.libs"];
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" "-i$srcdir/work/rsyslog.pid" "-M../runtime/.libs"];
#interact;
expect "}}"; # eat startup message
set udpSock [udp_open];
udp_conf $udpSock 127.0.0.1 514
set files [glob "testruns/*.parse1"]
set files [glob "$srcdir/testruns/*.parse1"]
set failed 0;
puts "\nExecuting parser test suite...";

2
tests/parsertest
View File

@ -1,2 +1,2 @@
# run parser test suite
tclsh parser.tcl
tclsh $srcdir/parser.tcl $srcdir

2
tests/testruns/parser.conf
View File

@ -1,11 +1,9 @@
$ModLoad ../plugins/omstdout/.libs/omstdout
$ModLoad ../plugins/imuxsock/.libs/imuxsock
$ModLoad ../plugins/imudp/.libs/imudp
$UDPServerRun 514
$ErrorMessagesToStderr off
# use a special format that we can easily parse in expect
#$template expect,"{{%PRI%,%syslogtag%,%hostname%}}"
$template expect,"{{%PRI%,%syslogfacility-text%,%syslogseverity-text%,%timestamp%,%hostname%,%programname%,%syslogtag%,%msg%}}"
*.* :omstdout:;expect

3
tests/work/dummy Normal file
View File

@ -0,0 +1,3 @@
This is a dummy file. It's only purpose is to ensure
that ./test/work is created so that "make distcheck"
and "make check" can operate properly.