diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-16 15:08:53 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-16 15:08:53 +0100 |
| commit | 2fc70320e303fd02b29469416a709a1f8ee4374d (patch) | |
| tree | 9de5d8b20ad8d6e7a6d85c559056a68a68adff1e /tests/Makefile.am | |
| parent | 33366f2f1e271f47edeed75f69d9885171e61ea0 (diff) | |
| parent | 9e18ecc9bd14093b78199fd36c315cfce4d26a26 (diff) | |
| download | rsyslog-2fc70320e303fd02b29469416a709a1f8ee4374d.tar.gz rsyslog-2fc70320e303fd02b29469416a709a1f8ee4374d.tar.xz rsyslog-2fc70320e303fd02b29469416a709a1f8ee4374d.zip | |
Merge branch 'v5-stable' into v5-beta
Conflicts:
tests/Makefile.am
Diffstat (limited to 'tests/Makefile.am')
| -rw-r--r-- | tests/Makefile.am | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index c64d44e9..c1818f36 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -52,6 +52,11 @@ TESTS += \ discard-rptdmsg.sh \ discard-allmark.sh \ discard.sh \ + failover-basic.sh \ + failover-rptd.sh \ + failover-no-rptd.sh \ + failover-no-basic.sh \ + queue-persist.sh queue-persist.sh \ linkedlistqueue.sh endif @@ -80,7 +85,6 @@ TESTS += \ endif endif - if ENABLE_IMPTCP TESTS += \ manyptcp.sh \ @@ -260,6 +264,14 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \ omod-if-array.sh \ discard.sh \ testsuites/discard.conf \ + failover-no-rptd.sh \ + testsuites/failover-no-rptd.conf \ + failover-no-basic.sh \ + testsuites/failover-no-basic.conf \ + failover-rptd.sh \ + testsuites/failover-rptd.conf \ + failover-basic.sh \ + testsuites/failover-basic.conf \ discard-rptdmsg.sh \ discard-rptdmsg-vg.sh \ testsuites/discard-rptdmsg.conf \ |