summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-11-05 12:56:07 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2010-11-05 12:56:07 +0100
commitc470879eff9256612cfcff4938ed81425b3cc3c6 (patch)
tree0b2f887a9f03f6610b1b20074a54ce23604ee912
parent7f6b471bf56d1ced716a21bc3a7444b2fab985ea (diff)
downloadrsyslog-c470879eff9256612cfcff4938ed81425b3cc3c6.tar.gz
rsyslog-c470879eff9256612cfcff4938ed81425b3cc3c6.tar.xz
rsyslog-c470879eff9256612cfcff4938ed81425b3cc3c6.zip
bugfix: testbench failed if imptcp was not enabled
-rw-r--r--ChangeLog1
-rw-r--r--tests/Makefile.am10
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 469ee115..fb1628e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ Version 5.6.1 [V5-BETA] (rgerhards), 2010-??-??
epoll_create().
Bug: http://bugzilla.adiscon.com/show_bug.cgi?id=204
Thanks to Nicholas Brink for reporting this problem.
+- bugfix: testbench failed if imptcp was not enabled
- bugfix: segfault when an *empty* template was used
Bug: http://bugzilla.adiscon.com/show_bug.cgi?id=206
Thanks to David Hill for alerting us.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a0231503..3c00c24a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -14,9 +14,6 @@ TESTS = $(TESTRUNS) cfg.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 \
@@ -51,6 +48,13 @@ TESTS = $(TESTRUNS) cfg.sh \
dircreate_off.sh \
queue-persist.sh
+if ENABLE_IMPTCP
+TESTS += \
+ imptcp_large.sh \
+ imptcp_addtlframedelim.sh \
+ imptcp_conndrop.sh
+endif
+
if ENABLE_OMUDPSPOOF
TESTS += sndrcv_omudpspoof.sh \
sndrcv_omudpspoof_nonstdpt.sh