added new configure option that permits to disable and enable an extended testbench

4 files changed, 27 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 83ca5033..3c77751a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
+---------------------------------------------------------------------------
+Version 4.6.3  [v4-stable] (rgerhards), 2010-04-??
 - improvded testbench
   - added test with truly random data received via syslog to test
     robustness
+  - added new configure option that permits to disable and enable an
+    extended testbench
 - bugfix: default for $OMFileFlushOnTXEnd was wrong ("off").
   This, in default mode, caused buffered writing to be used, what
   means that it looked like no output were written or partial
diff --git a/Makefile.am b/Makefile.am
index a050e95e..f5f9a6ed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -134,5 +134,5 @@ SUBDIRS += tests
 # temporarily be removed below. The intent behind forcing everthing to compile
 # in a make distcheck is so that we detect code that accidently was not updated
 # when some global update happened.
-DISTCHECK_CONFIGURE_FLAGS=--enable-gssapi_krb5 --enable-imfile --enable-snmp --enable-pgsql --enable-libdbi --enable-mysql --enable-omtemplate --enable-imtemplate --enable-relp --enable-rsyslogd --enable-mail --enable-klog  --enable-diagtools --enable-gnutls --enable-omstdout --enable-omprog --enable-imdiag --enable-shave
+DISTCHECK_CONFIGURE_FLAGS=--enable-gssapi_krb5 --enable-imfile --enable-snmp --enable-pgsql --enable-libdbi --enable-mysql --enable-omtemplate --enable-imtemplate --enable-relp --enable-rsyslogd --enable-mail --enable-klog  --enable-diagtools --enable-gnutls --enable-omstdout --enable-omprog --enable-imdiag --enable-shave --enable-extended-tests
 ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.ac b/configure.ac
index b01396d6..bfd78281 100644
--- a/configure.ac
+++ b/configure.ac
@@ -612,6 +612,23 @@ AC_ARG_ENABLE(rsyslogd,
 AM_CONDITIONAL(ENABLE_RSYSLOGD, test x$enable_rsyslogd = xyes)
 
 
+# capability to enable an extended testbench. By default, this is off. The reason
+# for this switch is that some test simply take too long to execute them on a regular
+# basis. So we enable to skip them, while the majority of tests can still be used. The
+# idea is that at least "make distcheck" executes the extended testbench, and also
+# developers should explicitely enable it after important changes. -- rgerhards, 2010-04-12
+AC_ARG_ENABLE(extended_tests,
+        [AS_HELP_STRING([--enable-extended-tests],[extended testbench @<:@default=no@:>@])],
+        [case "${enableval}" in
+         yes) enable_rsyslogd="yes" ;;
+          no) enable_rsyslogd="no" ;;
+           *) AC_MSG_ERROR(bad value ${enableval} for --enable-extended-tests) ;;
+         esac],
+        [enable_extended_tests=no]
+)
+AM_CONDITIONAL(ENABLE_EXTENDED_TESTS, test x$enable_extended_tests = xyes)
+
+
 # Mail support (so far we do not need a library, but we need to turn this on and off)
 AC_ARG_ENABLE(mail,
         [AS_HELP_STRING([--enable-mail],[Enable mail support @<:@default=no@:>@])],
@@ -864,6 +881,7 @@ echo "    SNMP support enabled:                     $enable_snmp"
 echo
 echo "---{ debugging support }---"
 echo "    Testbench enabled:                        $enable_testbench"
+echo "    Extended Testbench enabled:               $enable_extended_tests"
 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 76ed694a..cdc0d647 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -24,7 +24,6 @@ TESTS = $(TESTRUNS) cfg.sh \
 	dynfile_invld_sync.sh \
 	dynfile_invalid2.sh \
 	complex1.sh \
-	random.sh \
 	queue-persist.sh \
 	pipeaction.sh
 	execonlyonce.sh \
@@ -41,6 +40,10 @@ TESTS += omod-if-array.sh \
 	 fieldtest.sh
 endif
 
+if ENABLE_EXTENDED_TESTS
+TESTS += random.sh 
+endif
+
 check_JAVA = DiagTalker.java
 
 endif # if ENABLE_TESTBENCH