diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-10-15 08:06:40 -0700 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-10-15 08:06:40 -0700 |
| commit | 5d8b1846ec376f590b390aef22566b6f87a8c188 (patch) | |
| tree | caac7e1cc47713f6a30b3a8c631fca981080c8f7 /tests/Makefile.am | |
| parent | 6714bb931bcbe8d1a4ca60f503598f57e6ebe3b9 (diff) | |
| parent | 3700a64d973f55e1cc8bd478e203f00d529ce27b (diff) | |
| download | rsyslog-5d8b1846ec376f590b390aef22566b6f87a8c188.tar.gz rsyslog-5d8b1846ec376f590b390aef22566b6f87a8c188.tar.bz2 rsyslog-5d8b1846ec376f590b390aef22566b6f87a8c188.zip | |
Merge branch 'v4-devel' into v5-beta
Conflicts:
Makefile.am
tests/tcpflood.c
Diffstat (limited to 'tests/Makefile.am')
| -rw-r--r-- | tests/Makefile.am | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index d630da3a..8538140e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -13,6 +13,12 @@ TESTS = $(TESTRUNS) cfg.sh \ rulesetmultiqueue.sh \ manytcp.sh \ rsf_getenv.sh \ + manyptcp.sh \ + imptcp_large.sh \ + imptcp_addtlframedelim.sh \ + imptcp_conndrop.sh \ + imtcp_conndrop.sh \ + imtcp_addtlframedelim.sh \ sndrcv.sh \ sndrcv_gzip.sh \ sndrcv_udp.sh \ @@ -182,6 +188,18 @@ 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_addtlframedelim.sh \ + testsuites/imptcp_addtlframedelim.conf \ + imptcp_conndrop.sh \ + testsuites/imptcp_conndrop.conf \ + imtcp_conndrop.sh \ + testsuites/imtcp_conndrop.conf \ + imtcp_addtlframedelim.sh \ + testsuites/imtcp_addtlframedelim.conf \ inputname.sh \ testsuites/inputname_imtcp.conf \ testsuites/1.inputname_imtcp_12514 \ |