diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-04 03:27:41 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-04 03:27:41 +0200 |
| commit | 92d10abc1b66907f84b82d2d34552a90b852aa5f (patch) | |
| tree | 8a90476f1ab39e133ff741ea2ad18010335b2b87 /tests | |
| parent | b22990c6d359ffdedbf266672b8c875964b81d64 (diff) | |
| parent | 4f742a8e32c43dc9b514ceaf80f4d17e697dfdf6 (diff) | |
| download | rsyslog-92d10abc1b66907f84b82d2d34552a90b852aa5f.tar.gz rsyslog-92d10abc1b66907f84b82d2d34552a90b852aa5f.tar.xz rsyslog-92d10abc1b66907f84b82d2d34552a90b852aa5f.zip | |
Merge branch 'master' into v5-devel
Conflicts:
ChangeLog
runtime/rsyslog.h
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index dfcbb598..04008a1b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,3 +1,4 @@ +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 \ @@ -11,6 +12,8 @@ if ENABLE_OMSTDOUT TESTS += omod-if-array.sh parsertest.sh inputname.sh fieldtest.sh endif +endif # if ENABLE_TESTBENCH + TESTS_ENVIRONMENT = RSYSLOG_MODDIR='$(abs_top_builddir)'/runtime/.libs/ DISTCLEANFILES=rsyslog.pid '$(abs_top_builddir)'/DiagTalker.class test_files = testbench.h runtime-dummy.c |