diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-11-25 18:04:00 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-11-25 18:04:00 +0100 |
commit | 786a44a0243cc6a5b0d47fb15f8f20a1a3f5bf0e (patch) | |
tree | 1948874c8d8b7a876ad5e3817a292889b94a68d4 /tests | |
parent | 950fe206f84322bdff755988403a9d4017ec26f4 (diff) | |
parent | 44300ddcb2904105e2ecd56479bf396399dcab26 (diff) | |
download | rsyslog-786a44a0243cc6a5b0d47fb15f8f20a1a3f5bf0e.tar.gz rsyslog-786a44a0243cc6a5b0d47fb15f8f20a1a3f5bf0e.tar.xz rsyslog-786a44a0243cc6a5b0d47fb15f8f20a1a3f5bf0e.zip |
Merge branch 'v5-devel'
Conflicts:
runtime/rsyslog.h
Diffstat (limited to 'tests')
-rw-r--r-- | tests/Makefile.am | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 9bef8ff9..25d972d7 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 |