diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-06-21 15:42:11 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-06-21 15:42:11 +0200 |
commit | b71ef4abad365f95cf7adf3df14083940d531f1f (patch) | |
tree | c5744b7c3adb4e7ede7a282949cbfe41e414c813 /tests/sndrcv_drvr.sh | |
parent | b1a905c5eb7833d661be4a910697f49deb34c640 (diff) | |
parent | 86225089f2d0e82deb368e1688464e8ba84d24cf (diff) | |
download | rsyslog-b71ef4abad365f95cf7adf3df14083940d531f1f.tar.gz rsyslog-b71ef4abad365f95cf7adf3df14083940d531f1f.tar.xz rsyslog-b71ef4abad365f95cf7adf3df14083940d531f1f.zip |
Merge branch 'v5-stable' into beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
tests/diag.sh
tests/sndrcv_drvr.sh
Diffstat (limited to 'tests/sndrcv_drvr.sh')
-rwxr-xr-x | tests/sndrcv_drvr.sh | 42 |
1 files changed, 1 insertions, 41 deletions
diff --git a/tests/sndrcv_drvr.sh b/tests/sndrcv_drvr.sh index 9f036a31..1f3b9113 100755 --- a/tests/sndrcv_drvr.sh +++ b/tests/sndrcv_drvr.sh @@ -1,41 +1 @@ -# This is test driver for testing two rsyslog instances. It can be -# utilized by any test that just needs two instances with different -# config files, where messages are injected in instance TWO and -# (with whatever rsyslog mechanism) being relayed over to instance ONE, -# where they are written to the log file. After the run, the completeness -# of that log file is checked. -# The code is almost the same, but the config files differ (probably greatly) -# for different test cases. As such, this driver needs to be called with the -# config file name ($2). From that name, the sender and receiver config file -# names are automatically generated. -# So: $1 config file name, $2 number of messages -# -# added 2009-11-11 by Rgerhards -# This file is part of the rsyslog project, released under GPLv3 -# uncomment for debugging support: -source $srcdir/diag.sh init -# start up the instances -#export RSYSLOG_DEBUG="debug nostdout" -#export RSYSLOG_DEBUGLOG="log" -source $srcdir/diag.sh startup $1_rcvr.conf -source $srcdir/diag.sh wait-startup -#export RSYSLOG_DEBUGLOG="log2" -#valgrind="valgrind" -source $srcdir/diag.sh startup $1_sender.conf 2 -source $srcdir/diag.sh wait-startup 2 - -# now inject the messages into instance 2. It will connect to instance 1, -# and that instance will record the data. -source $srcdir/diag.sh tcpflood -m$2 -i1 -sleep 2 # make sure all data is received in input buffers -# shut down sender when everything is sent, receiver continues to run concurrently -source $srcdir/diag.sh shutdown-when-empty 2 -source $srcdir/diag.sh wait-shutdown 2 -# now it is time to stop the receiver as well -echo "Shutting down instance 1 (receiver)" -source $srcdir/diag.sh shutdown-when-empty -source $srcdir/diag.sh wait-shutdown - -# do the final check -source $srcdir/diag.sh seq-check 1 $2 -source $srcdir/diag.sh exit +source $srcdir/sndrcv_drvr_noexit.sh $1 $2 |