summaryrefslogtreecommitdiffstats
path: root/tests/Makefile.am
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-08-11 15:09:21 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2010-08-11 15:09:21 +0200
commitd89c2e2062117b49f18688531ac93b7ac0307042 (patch)
tree2cad11b45560e5a8f44d48c36336f5d2904b0988 /tests/Makefile.am
parent99b3b670e81bff0afc877f52cd261b354444aec1 (diff)
parent00fc38c96fc56af2d9ab3445b23c9fbb03c127ab (diff)
downloadrsyslog-d89c2e2062117b49f18688531ac93b7ac0307042.tar.gz
rsyslog-d89c2e2062117b49f18688531ac93b7ac0307042.tar.xz
rsyslog-d89c2e2062117b49f18688531ac93b7ac0307042.zip
Merge branch 'v5-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 feb33e49..8538140e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -15,8 +15,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 \
sndrcv_udp.sh \
@@ -190,10 +192,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 \