diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-02-25 11:13:50 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-02-25 11:13:50 +0100 |
| commit | 0d79a0304d8e50ac613212ad9dcac8d824b12fb1 (patch) | |
| tree | 89bc10dda3eab9d74ef077712c62d433a2339594 | |
| parent | e9aca61ad35a35ad8c3c7c6b8a608b4ff94312be (diff) | |
| parent | 0ed775c9ed5965cf61ffd7f4893de144c7168517 (diff) | |
| download | rsyslog-0d79a0304d8e50ac613212ad9dcac8d824b12fb1.tar.gz rsyslog-0d79a0304d8e50ac613212ad9dcac8d824b12fb1.tar.xz rsyslog-0d79a0304d8e50ac613212ad9dcac8d824b12fb1.zip | |
Merge branch 'v5-beta' of git+ssh://git.adiscon.com/git/rsyslog into v5-beta
| -rw-r--r-- | tests/Makefile.am | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index f66270ab..694b28ab 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -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 |