diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-09 09:58:07 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-09 09:58:07 +0100 |
| commit | 3f657f5b056c02cddb17ad639b226f24ebb047c5 (patch) | |
| tree | f8d46d479054606c98bbc14b8cfba229afb7b30a /tests | |
| parent | 22f36ffbbd0c4e0fe1bfe331cb7ca15ec6ae80aa (diff) | |
| download | rsyslog-3f657f5b056c02cddb17ad639b226f24ebb047c5.tar.gz rsyslog-3f657f5b056c02cddb17ad639b226f24ebb047c5.tar.xz rsyslog-3f657f5b056c02cddb17ad639b226f24ebb047c5.zip | |
make testbench not errout if imdiag is not enabled
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 7527b27f..a720c0c3 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 msleep randomgen diagtalker uxsockrcvr syslog_caller syslog_inject -TESTS = $(TESTRUNS) cfg.sh \ +TESTS = $(TESTRUNS) cfg.sh + +if ENABLE_IMDIAG +TESTS += \ arrayqueue.sh \ linkedlistqueue.sh \ da-mainmsg-q.sh \ @@ -49,7 +52,10 @@ TESTS = $(TESTRUNS) cfg.sh \ imuxsock_ccmiddle_root.sh \ discard-rptdmsg.sh \ discard.sh \ - queue-persist.sh + queue-persist.sh \ + arrayqueue.sh \ + linkedlistqueue.sh +endif if HAVE_VALGRIND TESTS += \ @@ -89,9 +95,11 @@ TESTS += omod-if-array.sh \ endif if ENABLE_OMRULESET +if ENABLE_IMDIAG TESTS += omruleset.sh \ omruleset-queue.sh endif +endif if ENABLE_EXTENDED_TESTS TESTS += random.sh @@ -193,9 +201,7 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \ testsuites/rsf_getenv.conf \ diskqueue.sh \ testsuites/diskqueue.conf \ - arrayqueue.sh \ testsuites/arrayqueue.conf \ - linkedlistqueue.sh \ testsuites/linkedlistqueue.conf \ da-mainmsg-q.sh \ testsuites/da-mainmsg-q.conf \ |