diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-09 14:05:22 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-09 14:05:22 +0200 |
| commit | da0b293b5d13f90519cac0b771a6aff501a67d3d (patch) | |
| tree | 68c3d7377aa174c5f0999ea2090de2bb819e0dd0 /tests | |
| parent | 8f0a8076cc8194036dbd4edca1c2c30a7822dd09 (diff) | |
| download | rsyslog-da0b293b5d13f90519cac0b771a6aff501a67d3d.tar.gz rsyslog-da0b293b5d13f90519cac0b771a6aff501a67d3d.tar.xz rsyslog-da0b293b5d13f90519cac0b771a6aff501a67d3d.zip | |
preparing for 5.5.3 releasev5.5.3
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 1 | ||||
| -rwxr-xr-x | tests/complex1.sh | 4 | ||||
| -rwxr-xr-x | tests/diag.sh | 6 | ||||
| -rwxr-xr-x | tests/dynfile_invalid2.sh | 4 | ||||
| -rwxr-xr-x | tests/gzipwr_large_dynfile.sh | 4 |
5 files changed, 10 insertions, 9 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index b931a1fa..b4d8f5af 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -144,6 +144,7 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \ testsuites/parse3.conf \ testsuites/reallife.parse3 \ testsuites/parse-nodate.conf \ + testsuites/samples.parse-nodate \ testsuites/parse_invld_regex.conf \ testsuites/samples.parse_invld_regex \ testsuites/parse-3164-buggyday.conf \ diff --git a/tests/complex1.sh b/tests/complex1.sh index 7395bf21..b3e31b30 100755 --- a/tests/complex1.sh +++ b/tests/complex1.sh @@ -7,8 +7,8 @@ echo =========================================================================== echo TEST: \[complex1.sh\]: complex test with gzip and multiple action queues source $srcdir/diag.sh init # uncomment for debugging support: -export RSYSLOG_DEBUG="debug nostdout" -export RSYSLOG_DEBUGLOG="log" +#export RSYSLOG_DEBUG="debug nostdout" +#export RSYSLOG_DEBUGLOG="log" source $srcdir/diag.sh startup complex1.conf # send 40,000 messages of 400 bytes plus header max, via three dest ports source $srcdir/diag.sh tcpflood -m40000 -rd400 -P129 -f5 -n3 -c15 -i1 diff --git a/tests/diag.sh b/tests/diag.sh index a39b876f..9ba4ad23 100755 --- a/tests/diag.sh +++ b/tests/diag.sh @@ -21,15 +21,15 @@ case $1 in rm -f rsyslogd2.started work-*.conf rm -f work rsyslog.out.log rsyslog.out.log.save # common work files rm -rf test-spool test-logdir - rm -f rsyslog.out.*.log + rm -f rsyslog.out.*.log work-presort rm -f core.* vgcore.* mkdir test-spool ;; 'exit') rm -f rsyslogd.started work-*.conf diag-common.conf rm -f rsyslogd2.started diag-common2.conf rsyslog.action.*.include rm -f work rsyslog.out.log rsyslog.out.log.save # common work files - rm -rf test-spool test-logdir - rm -f rsyslog.out.*.log rsyslog.random.data + rm -rf test-spool test-logdir + rm -f rsyslog.out.*.log rsyslog.random.data work-presort echo ------------------------------------------------------------------------------- ;; 'startup') # start rsyslogd with default params. $2 is the config file name to use diff --git a/tests/dynfile_invalid2.sh b/tests/dynfile_invalid2.sh index b6fb3945..cb3ef51e 100755 --- a/tests/dynfile_invalid2.sh +++ b/tests/dynfile_invalid2.sh @@ -9,8 +9,8 @@ echo =========================================================================== echo TEST: \[dynfile_invalid2.sh\]: test open fail for dynafiles source $srcdir/diag.sh init # uncomment for debugging support: -export RSYSLOG_DEBUG="debug nostdout noprintmutexaction" -export RSYSLOG_DEBUGLOG="log" +#export RSYSLOG_DEBUG="debug nostdout noprintmutexaction" +#export RSYSLOG_DEBUGLOG="log" source $srcdir/diag.sh startup dynfile_invalid2.conf # we send handcrafted message. We have a dynafile cache of 4, and now send one message # each to fill up the cache. diff --git a/tests/gzipwr_large_dynfile.sh b/tests/gzipwr_large_dynfile.sh index ebd4c558..73d44796 100755 --- a/tests/gzipwr_large_dynfile.sh +++ b/tests/gzipwr_large_dynfile.sh @@ -18,8 +18,8 @@ echo =========================================================================== echo TEST: \[gzipwr_large_dynfile.sh\]: test for gzip file writing for large message sets source $srcdir/diag.sh init # uncomment for debugging support: -export RSYSLOG_DEBUG="debug nostdout" -export RSYSLOG_DEBUGLOG="log" +#export RSYSLOG_DEBUG="debug nostdout" +#export RSYSLOG_DEBUGLOG="log" source $srcdir/diag.sh startup gzipwr_large_dynfile.conf # send 4000 messages of 10.000bytes plus header max, randomized source $srcdir/diag.sh tcpflood -m4000 -r -d10000 -P129 -f5 |