summaryrefslogtreecommitdiffstats
path: root/tests/Makefile.am
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-08-11 15:08:50 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2010-08-11 15:08:50 +0200
commit053656420eb67ec3f7ce0dc57dcb2d22e8cfa0f8 (patch)
tree9aadb4810faf4eab01f19cbc6126ada6a6d06cf6 /tests/Makefile.am
parent32e715929f5d946d7244db3bc0595842dd293dd9 (diff)
parent809ed1768b83bc0c5392f943f4820523494e8285 (diff)
downloadrsyslog-053656420eb67ec3f7ce0dc57dcb2d22e8cfa0f8.tar.gz
rsyslog-053656420eb67ec3f7ce0dc57dcb2d22e8cfa0f8.tar.xz
rsyslog-053656420eb67ec3f7ce0dc57dcb2d22e8cfa0f8.zip
Merge branch 'v4-stable-imptcp' into v4-devel
Diffstat (limited to 'tests/Makefile.am')
-rw-r--r--tests/Makefile.am6
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ac0844e9..5914f94b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -10,8 +10,10 @@ TESTS = $(TESTRUNS) cfg.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 \
asynwr_simple.sh \
@@ -146,10 +148,14 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \
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 \