diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-08 18:45:22 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-08 18:45:22 +0100 |
| commit | d50f1e711ffd479d1ddbc89342e9b28b8b9abba9 (patch) | |
| tree | 8364adc48f18f3fafb66990a0ed6a55e66a16da5 /tests/Makefile.am | |
| parent | f813c01258ec5ef3adc8f4790c5c743c2f4b462a (diff) | |
| parent | 3866bd51bf7e622594ff4831664c28d80f711cb3 (diff) | |
| download | rsyslog-d50f1e711ffd479d1ddbc89342e9b28b8b9abba9.tar.gz rsyslog-d50f1e711ffd479d1ddbc89342e9b28b8b9abba9.tar.xz rsyslog-d50f1e711ffd479d1ddbc89342e9b28b8b9abba9.zip | |
Merge branch 'v5-stable' into v5-beta
Conflicts:
ChangeLog
tests/Makefile.am
tools/syslogd.c
Diffstat (limited to 'tests/Makefile.am')
| -rw-r--r-- | tests/Makefile.am | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 2e2e47aa..c834ef6e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -48,6 +48,8 @@ TESTS = $(TESTRUNS) cfg.sh \ imuxsock_logger_root.sh \ imuxsock_traillf_root.sh \ imuxsock_ccmiddle_root.sh \ + discard-rptdmsg.sh \ + discard.sh \ queue-persist.sh if ENABLE_IMPTCP @@ -75,7 +77,6 @@ TESTS += omod-if-array.sh \ inputname.sh \ threadingmq.sh \ threadingmqaq.sh \ - discard.sh \ badqi.sh \ tabescape_dflt.sh \ tabescape_off.sh \ @@ -221,6 +222,8 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \ omod-if-array.sh \ discard.sh \ testsuites/discard.conf \ + discard-rptdmsg.sh \ + testsuites/discard-rptdmsg.conf \ diag.sh \ testsuites/diag-common.conf \ testsuites/diag-common2.conf \ |