diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-20 18:31:14 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-20 18:31:14 +0100 |
| commit | dffcfa8699c41d9f64b7aee131a32661587ce441 (patch) | |
| tree | b40bf642c459a2646ef3522b85e234d00cf4145d /tests | |
| parent | 9e28d47aaa506709a9e80e318527ceb4443cbffe (diff) | |
| parent | 903811a856109486ce238133fc8c68fa89f26514 (diff) | |
| download | rsyslog-dffcfa8699c41d9f64b7aee131a32661587ce441.tar.gz rsyslog-dffcfa8699c41d9f64b7aee131a32661587ce441.tar.xz rsyslog-dffcfa8699c41d9f64b7aee131a32661587ce441.zip | |
Merge branch 'v4-beta' into v4-devel
Conflicts:
configure.ac
doc/manual.html
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 1 | ||||
| -rwxr-xr-x | tests/sndrcv_drvr.sh | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index cc39c4e3..6091896b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -114,6 +114,7 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \ omod-if-array.sh \ diag.sh \ testsuites/diag-common.conf \ + testsuites/diag-common2.conf \ queue-persist.sh \ queue-persist-drvr.sh \ testsuites/queue-persist.conf \ diff --git a/tests/sndrcv_drvr.sh b/tests/sndrcv_drvr.sh index 9835a8eb..63afd6b5 100755 --- a/tests/sndrcv_drvr.sh +++ b/tests/sndrcv_drvr.sh @@ -35,6 +35,7 @@ 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 127.0.0.1 13514 1 $2 1 +sleep 2 # make sure all data is received in input buffers # shut down sender when everything is sent, receiver continues to run concurrently # may be needed by TLS (once we do it): sleep 60 source $srcdir/diag.sh shutdown-when-empty 2 |