diff options
| author | Michael Biebl <biebl@debian.org> | 2009-05-18 21:41:31 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-19 07:31:22 +0200 |
| commit | 460edfe27fcca96e88d6541a3e1ccb49ab4b1a7a (patch) | |
| tree | 102ab3407840f5bc48a8b5d26baaa3875ad66b02 | |
| parent | 5ab3e8005f62c2016bdb2d3b099d1d8c1a4cf2bc (diff) | |
| download | rsyslog-460edfe27fcca96e88d6541a3e1ccb49ab4b1a7a.tar.gz rsyslog-460edfe27fcca96e88d6541a3e1ccb49ab4b1a7a.tar.xz rsyslog-460edfe27fcca96e88d6541a3e1ccb49ab4b1a7a.zip | |
Do not fail "make check" if omstdout is not enabled
Only run omod-if-array.sh and parsertest.sh test if omstdout plugin is
enabled.
Remove the comment and fix the help output for --enable-stdout (default
was "no", not "yes")
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | tests/Makefile.am | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index a93a968c..9b160379 100644 --- a/configure.ac +++ b/configure.ac @@ -736,10 +736,8 @@ AM_CONDITIONAL(ENABLE_OMTEMPLATE, test x$enable_omtemplate = xyes) # settings for omstdout -# note that "make check" fails, if omstdout is not enabled (thus we enable -# it by default). AC_ARG_ENABLE(omstdout, - [AS_HELP_STRING([--enable-omstdout],[Compiles stdout template module @<:@default=yes@:>@])], + [AS_HELP_STRING([--enable-omstdout],[Compiles stdout template module @<:@default=no@:>@])], [case "${enableval}" in yes) enable_omstdout="yes" ;; no) enable_omstdout="no" ;; diff --git a/tests/Makefile.am b/tests/Makefile.am index 0f4cbce1..ed415a1e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,6 +1,9 @@ TESTRUNS = rt_init rscript check_PROGRAMS = $(TESTRUNS) ourtail nettester tcpflood chkseq -TESTS = $(TESTRUNS) cfg.sh parsertest.sh omod-if-array.sh manytcp.sh diskqueue.sh +TESTS = $(TESTRUNS) cfg.sh manytcp.sh diskqueue.sh +if ENABLE_OMSTDOUT +TESTS += omod-if-array.sh parsertest.sh +endif TESTS_ENVIRONMENT = RSYSLOG_MODDIR='$(abs_top_builddir)'/runtime/.libs/ DISTCLEANFILES=rsyslog.pid test_files = testbench.h runtime-dummy.c @@ -8,7 +11,7 @@ test_files = testbench.h runtime-dummy.c EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \ cfg1.cfgtest \ cfg1.testin \ - cfg2.cfgtest \ + cfg2.cfgtest \ cfg2.testin \ cfg3.cfgtest \ cfg3.testin \ @@ -19,7 +22,7 @@ EXTRA_DIST= 1.rstest 2.rstest 3.rstest err1.rstest \ NoExistFile.cfgtest \ testsuites/parse1.conf \ testsuites/1.parse1 \ - testsuites/rfc3164.parse1 \ + testsuites/rfc3164.parse1 \ testsuites/rfc5424-1.parse1 \ testsuites/rfc5424-2.parse1 \ testsuites/rfc5424-3.parse1 \ |