diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-04 10:19:47 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-04 10:19:47 +0200 |
commit | cf1289737659a8a807419b51566613c9fb776005 (patch) | |
tree | 7239a6e6fe4d44bcc6b8a8a2b56c067779e42452 /tests/Makefile.am | |
parent | 92d10abc1b66907f84b82d2d34552a90b852aa5f (diff) | |
parent | 58e707b441aea88cd318762e6968e1db1211f949 (diff) | |
download | rsyslog-cf1289737659a8a807419b51566613c9fb776005.tar.gz rsyslog-cf1289737659a8a807419b51566613c9fb776005.tar.xz rsyslog-cf1289737659a8a807419b51566613c9fb776005.zip |
Merge branch 'master' into v5-devel
Conflicts:
runtime/rsyslog.h
tests/Makefile.am
Diffstat (limited to 'tests/Makefile.am')
-rw-r--r-- | tests/Makefile.am | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 04008a1b..e22b429c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,7 +1,10 @@ if ENABLE_TESTBENCH TESTRUNS = rt_init rscript check_PROGRAMS = $(TESTRUNS) ourtail nettester tcpflood chkseq -TESTS = $(TESTRUNS) cfg.sh arrayqueue.sh linkedlistqueue.sh da-mainmsg-q.sh \ +TESTS = $(TESTRUNS) cfg.sh \ + arrayqueue.sh \ + linkedlistqueue.sh \ + da-mainmsg-q.sh \ validation-run.sh \ imtcp-multiport.sh \ diskqueue.sh manytcp.sh \ |