mirror of
https://github.com/rsyslog/rsyslog.git
synced 2025-12-21 17:10:44 +01:00
Merge branch 'v5-beta' of git+ssh://git.adiscon.com/git/rsyslog into v5-beta
This commit is contained in:
commit
0d79a0304d
@ -13,7 +13,6 @@ TESTS = $(TESTRUNS) cfg.sh \
|
||||
rulesetmultiqueue.sh \
|
||||
manytcp.sh \
|
||||
rsf_getenv.sh \
|
||||
manyptcp.sh \
|
||||
imtcp_conndrop.sh \
|
||||
imtcp_addtlframedelim.sh \
|
||||
sndrcv.sh \
|
||||
@ -37,7 +36,6 @@ TESTS = $(TESTRUNS) cfg.sh \
|
||||
complex1.sh \
|
||||
queue-persist.sh \
|
||||
pipeaction.sh \
|
||||
uxsock_simple.sh \
|
||||
execonlyonce.sh \
|
||||
execonlywhenprevsuspended.sh \
|
||||
execonlywhenprevsuspended2.sh \
|
||||
@ -53,11 +51,16 @@ TESTS = $(TESTRUNS) cfg.sh \
|
||||
|
||||
if ENABLE_IMPTCP
|
||||
TESTS += \
|
||||
manyptcp.sh \
|
||||
imptcp_large.sh \
|
||||
imptcp_addtlframedelim.sh \
|
||||
imptcp_conndrop.sh
|
||||
endif
|
||||
|
||||
if ENABLE_OMUXSOCK
|
||||
TESTS += uxsock_simple.sh
|
||||
endif
|
||||
|
||||
if ENABLE_OMUDPSPOOF
|
||||
TESTS += sndrcv_omudpspoof.sh \
|
||||
sndrcv_omudpspoof_nonstdpt.sh
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user