diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-11 12:49:16 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-11 12:49:16 +0200 |
| commit | a77a99bfbf8505d05b08a981ab25d599af864ce5 (patch) | |
| tree | 2445512303106459f455d359114c71c46ef87353 /tests/Makefile.am | |
| parent | d3fe3b28aca6ffd616f55929af9f459585739a06 (diff) | |
| parent | 32e715929f5d946d7244db3bc0595842dd293dd9 (diff) | |
| download | rsyslog-a77a99bfbf8505d05b08a981ab25d599af864ce5.tar.gz rsyslog-a77a99bfbf8505d05b08a981ab25d599af864ce5.tar.xz rsyslog-a77a99bfbf8505d05b08a981ab25d599af864ce5.zip | |
Merge branch 'v4-devel' into master
Conflicts:
Makefile.am
tests/tcpflood.c
Diffstat (limited to 'tests/Makefile.am')
| -rw-r--r-- | tests/Makefile.am | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index d630da3a..feb33e49 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -13,6 +13,10 @@ TESTS = $(TESTRUNS) cfg.sh \ rulesetmultiqueue.sh \ manytcp.sh \ rsf_getenv.sh \ + manyptcp.sh \ + imptcp_large.sh \ + imptcp_conndrop.sh \ + imtcp_conndrop.sh \ sndrcv.sh \ sndrcv_gzip.sh \ sndrcv_udp.sh \ @@ -182,6 +186,14 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \ testsuites/imtcp-multiport.conf \ manytcp.sh \ testsuites/manytcp.conf \ + manyptcp.sh \ + testsuites/manyptcp.conf \ + imptcp_large.sh \ + testsuites/imptcp_large.conf \ + imptcp_conndrop.sh \ + testsuites/imptcp_conndrop.conf \ + imtcp_conndrop.sh \ + testsuites/imtcp_conndrop.conf \ inputname.sh \ testsuites/inputname_imtcp.conf \ testsuites/1.inputname_imtcp_12514 \ |