diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-11 11:49:32 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-11 11:49:32 +0200 |
| commit | 32e715929f5d946d7244db3bc0595842dd293dd9 (patch) | |
| tree | 2a154cd6984690e91569feebcd6924efa0eb91b7 /tests/Makefile.am | |
| parent | 89f7dddf36d57c9261464560e3b2c0fb8ea88fd2 (diff) | |
| parent | c664adfa1683763ae503f2da9e8d4d528d6634d1 (diff) | |
| download | rsyslog-32e715929f5d946d7244db3bc0595842dd293dd9.tar.gz rsyslog-32e715929f5d946d7244db3bc0595842dd293dd9.tar.xz rsyslog-32e715929f5d946d7244db3bc0595842dd293dd9.zip | |
Merge branch 'v4-stable-imptcp' into tmp
Conflicts:
Makefile.am
configure.ac
runtime/rsyslog.h
tests/Makefile.am
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 201fbed6..ac0844e9 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -8,6 +8,10 @@ TESTS = $(TESTRUNS) cfg.sh \ diskqueue-fsync.sh \ manytcp.sh \ rsf_getenv.sh \ + manyptcp.sh \ + imptcp_large.sh \ + imptcp_conndrop.sh \ + imtcp_conndrop.sh \ sndrcv.sh \ sndrcv_gzip.sh \ asynwr_simple.sh \ @@ -138,6 +142,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 \ |