diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-03 07:51:47 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-03 07:51:47 +0200 |
| commit | 4f742a8e32c43dc9b514ceaf80f4d17e697dfdf6 (patch) | |
| tree | 62c34f867cb26781003022847e1285b67862c44c | |
| parent | b61e5fffc42c98b49a18a95c297653fb0ba06b72 (diff) | |
| download | rsyslog-4f742a8e32c43dc9b514ceaf80f4d17e697dfdf6.tar.gz rsyslog-4f742a8e32c43dc9b514ceaf80f4d17e697dfdf6.tar.xz rsyslog-4f742a8e32c43dc9b514ceaf80f4d17e697dfdf6.zip | |
added config switch --enable-testbench=no to turn off testbench
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | configure.ac | 15 | ||||
| -rw-r--r-- | tests/Makefile.am | 3 |
3 files changed, 19 insertions, 0 deletions
@@ -8,6 +8,7 @@ Version 4.3.2 [DEVEL] (rgerhards), 2009-??-?? considered useful for load balancers. - bugfix: imdiag/imtcp had a race condition - improved testbench (now much better code design and reuse) +- added config switch --enable-testbench=no to turn off testbench --------------------------------------------------------------------------- Version 4.3.1 [DEVEL] (rgerhards), 2009-05-25 - added capability to run multiple tcp listeners (on different ports) diff --git a/configure.ac b/configure.ac index 9fc59f76..70eea038 100644 --- a/configure.ac +++ b/configure.ac @@ -678,6 +678,20 @@ AC_SUBST(LIBLOGGING_CFLAGS) AC_SUBST(LIBLOGGING_LIBS) +# enable/disable the testbench (e.g. because some important parts +# are missing) +AC_ARG_ENABLE(testbench, + [AS_HELP_STRING([--enable-testbench],[file input module enabled @<:@default=yes@:>@])], + [case "${enableval}" in + yes) enable_testbench="yes" ;; + no) enable_testbench="no" ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-testbench) ;; + esac], + [enable_testbench=yes] +) +AM_CONDITIONAL(ENABLE_TESTBENCH, test x$enable_testbench = xyes) + + # settings for the file input module AC_ARG_ENABLE(imfile, [AS_HELP_STRING([--enable-imfile],[file input module enabled @<:@default=no@:>@])], @@ -844,6 +858,7 @@ echo " RELP support enabled: $enable_relp" echo " SNMP support enabled: $enable_snmp" echo echo "---{ debugging support }---" +echo " Testbench enabled: $enable_testbench" echo " Debug mode enabled: $enable_debug" echo " Runtime Instrumentation enabled: $enable_rtinst" echo " Diagnostic tools enabled: $enable_diagtools" diff --git a/tests/Makefile.am b/tests/Makefile.am index e93aba10..402c1d83 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 manytcp.sh diskqueue.sh imtcp-multiport.sh queue-persist.sh \ @@ -6,6 +7,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 |