mirror of
https://github.com/rsyslog/rsyslog.git
synced 2025-12-16 04:00:41 +01:00
Merge branch 'v4-stable' into v4-devel
Conflicts: ChangeLog
This commit is contained in:
Rainer Gerhards
commit
7053a438ef
@ -28,10 +28,12 @@ Version 4.7.0 [v4-devel] (rgerhards), 2009-09-??
|
||||
(bugs require certain non-standard settings to appear)
|
||||
Thanks to varmojfekoj for the patch [imported from 4.5.8]
|
||||
---------------------------------------------------------------------------
|
||||
Version 4.6.3 [v4-stable] (rgerhards), 2010-03-??
|
||||
Version 4.6.3 [v4-stable] (rgerhards), 2010-04-??
|
||||
- improvded testbench
|
||||
- added test with truly random data received via syslog to test
|
||||
robustness
|
||||
- added new configure option that permits to disable and enable an
|
||||
extended testbench
|
||||
- bugfix: default for $OMFileFlushOnTXEnd was wrong ("off").
|
||||
This, in default mode, caused buffered writing to be used, what
|
||||
means that it looked like no output were written or partial
|
||||
|
||||
@ -138,5 +138,5 @@ SUBDIRS += tests
|
||||
# temporarily be removed below. The intent behind forcing everthing to compile
|
||||
# in a make distcheck is so that we detect code that accidently was not updated
|
||||
# when some global update happened.
|
||||
DISTCHECK_CONFIGURE_FLAGS=--enable-gssapi_krb5 --enable-imfile --enable-snmp --enable-pgsql --enable-libdbi --enable-mysql --enable-omtemplate --enable-imtemplate --enable-relp --enable-rsyslogd --enable-mail --enable-klog --enable-diagtools --enable-gnutls --enable-omstdout --enable-omprog --enable-imdiag --enable-shave
|
||||
DISTCHECK_CONFIGURE_FLAGS=--enable-gssapi_krb5 --enable-imfile --enable-snmp --enable-pgsql --enable-libdbi --enable-mysql --enable-omtemplate --enable-imtemplate --enable-relp --enable-rsyslogd --enable-mail --enable-klog --enable-diagtools --enable-gnutls --enable-omstdout --enable-omprog --enable-imdiag --enable-shave --enable-extended-tests
|
||||
ACLOCAL_AMFLAGS = -I m4
|
||||
|
||||
18
configure.ac
18
configure.ac
@ -632,6 +632,23 @@ AC_ARG_ENABLE(rsyslogd,
|
||||
AM_CONDITIONAL(ENABLE_RSYSLOGD, test x$enable_rsyslogd = xyes)
|
||||
|
||||
|
||||
# capability to enable an extended testbench. By default, this is off. The reason
|
||||
# for this switch is that some test simply take too long to execute them on a regular
|
||||
# basis. So we enable to skip them, while the majority of tests can still be used. The
|
||||
# idea is that at least "make distcheck" executes the extended testbench, and also
|
||||
# developers should explicitely enable it after important changes. -- rgerhards, 2010-04-12
|
||||
AC_ARG_ENABLE(extended_tests,
|
||||
[AS_HELP_STRING([--enable-extended-tests],[extended testbench @<:@default=no@:>@])],
|
||||
[case "${enableval}" in
|
||||
yes) enable_rsyslogd="yes" ;;
|
||||
no) enable_rsyslogd="no" ;;
|
||||
*) AC_MSG_ERROR(bad value ${enableval} for --enable-extended-tests) ;;
|
||||
esac],
|
||||
[enable_extended_tests=no]
|
||||
)
|
||||
AM_CONDITIONAL(ENABLE_EXTENDED_TESTS, test x$enable_extended_tests = xyes)
|
||||
|
||||
|
||||
# Mail support (so far we do not need a library, but we need to turn this on and off)
|
||||
AC_ARG_ENABLE(mail,
|
||||
[AS_HELP_STRING([--enable-mail],[Enable mail support @<:@default=no@:>@])],
|
||||
@ -900,6 +917,7 @@ echo " SNMP support enabled: $enable_snmp"
|
||||
echo
|
||||
echo "---{ debugging support }---"
|
||||
echo " Testbench enabled: $enable_testbench"
|
||||
echo " Extended Testbench enabled: $enable_extended_tests"
|
||||
echo " Debug mode enabled: $enable_debug"
|
||||
echo " Runtime Instrumentation enabled: $enable_rtinst"
|
||||
echo " Diagnostic tools enabled: $enable_diagtools"
|
||||
|
||||
@ -25,7 +25,6 @@ TESTS = $(TESTRUNS) cfg.sh \
|
||||
dynfile_invld_sync.sh \
|
||||
dynfile_invalid2.sh \
|
||||
complex1.sh \
|
||||
random.sh \
|
||||
queue-persist.sh \
|
||||
pipeaction.sh
|
||||
execonlyonce.sh \
|
||||
@ -42,6 +41,10 @@ TESTS += omod-if-array.sh \
|
||||
fieldtest.sh
|
||||
endif
|
||||
|
||||
if ENABLE_EXTENDED_TESTS
|
||||
TESTS += random.sh
|
||||
endif
|
||||
|
||||
check_JAVA = DiagTalker.java
|
||||
|
||||
endif # if ENABLE_TESTBENCH
|
||||
@ -111,6 +114,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 \
|
||||
|
||||
@ -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
|
||||
|
||||
@ -20,7 +20,7 @@ case $1 in
|
||||
rm -f rsyslogd.started work-*.conf rsyslog.random.data
|
||||
rm -f rsyslogd2.started work-*.conf
|
||||
rm -f work rsyslog.out.log rsyslog.out.log.save # common work files
|
||||
rm -f rsyslog.out.*.log
|
||||
rm -f rsyslog.out.*.log work-presort
|
||||
rm -rf test-spool
|
||||
rm -f core.* vgcore.*
|
||||
mkdir test-spool
|
||||
@ -28,7 +28,7 @@ case $1 in
|
||||
'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 -f rsyslog.out.*.log rsyslog.random.data
|
||||
rm -f rsyslog.out.*.log rsyslog.random.data work-presort
|
||||
rm -rf test-spool
|
||||
;;
|
||||
'startup') # start rsyslogd with default params. $2 is the config file name to use
|
||||
|
||||
@ -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.
|
||||
|
||||
@ -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
|
||||
|
||||
@ -17,4 +17,4 @@ source $srcdir/diag.sh shutdown-when-empty # shut down rsyslogd when done proces
|
||||
source $srcdir/diag.sh wait-shutdown # and wait for it to terminate
|
||||
# we do not check anything yet, the point is if rsyslog survived ;)
|
||||
# TODO: check for exit message, but we'll notice an abort anyhow, so not that important
|
||||
#source $srcdir/diag.sh exit
|
||||
source $srcdir/diag.sh exit
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user