diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-06-21 16:11:58 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-06-21 16:11:58 +0200 |
| commit | 2bd4e10a4dc909346d5a010edefb12c65ed77aec (patch) | |
| tree | 6c32f32c24a71777880249c52b82c58646d74c15 /tests/Makefile.am | |
| parent | 42d36fbf3a06bb10e966abe1bcd288d335c6ad18 (diff) | |
| parent | b71ef4abad365f95cf7adf3df14083940d531f1f (diff) | |
| download | rsyslog-2bd4e10a4dc909346d5a010edefb12c65ed77aec.tar.gz rsyslog-2bd4e10a4dc909346d5a010edefb12c65ed77aec.tar.xz rsyslog-2bd4e10a4dc909346d5a010edefb12c65ed77aec.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
tests/Makefile.am
tests/manytcp-too-few-tls.sh
Diffstat (limited to 'tests/Makefile.am')
| -rw-r--r-- | tests/Makefile.am | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index ed25c388..3a514aa0 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -18,6 +18,7 @@ TESTS += \ imtcp_conndrop.sh \ imtcp_addtlframedelim.sh \ sndrcv.sh \ + sndrcv_failover.sh \ sndrcv_gzip.sh \ sndrcv_udp.sh \ sndrcv_udp_nonstdpt.sh \ @@ -55,6 +56,8 @@ TESTS += \ discard-rptdmsg.sh \ discard-allmark.sh \ discard.sh \ + failover-async.sh \ + failover-double.sh \ failover-basic.sh \ failover-rptd.sh \ failover-no-rptd.sh \ @@ -313,6 +316,10 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \ failover-basic.sh \ failover-basic-vg.sh \ testsuites/failover-basic.conf \ + failover-async.sh \ + testsuites/failover-async.conf \ + failover-double.sh \ + testsuites/failover-double.conf \ discard-rptdmsg.sh \ discard-rptdmsg-vg.sh \ testsuites/discard-rptdmsg.conf \ @@ -335,6 +342,10 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \ threadingmqaq.sh \ testsuites/threadingmqaq.conf \ sndrcv_drvr.sh \ + sndrcv_drvr_noexit.sh \ + sndrcv_failover.sh \ + testsuites/sndrcv_failover_sender.conf \ + testsuites/sndrcv_failover_rcvr.conf \ sndrcv.sh \ testsuites/sndrcv_sender.conf \ testsuites/sndrcv_rcvr.conf \ |