PR6550: --enable-dejazilla: optional automatic test result reporting

8 files changed, 94 insertions, 24 deletions

diff --git a/Makefile.in b/Makefile.in
index 8ff882b4..b5496252 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -176,6 +176,7 @@ CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
+CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -234,6 +235,7 @@ builddir = @builddir@
 cap_LIBS = @cap_LIBS@
 datadir = @datadir@
 datarootdir = @datarootdir@
+dejazilla = @dejazilla@
 docdir = @docdir@
 dvidir = @dvidir@
 elfutils_abs_srcdir = @elfutils_abs_srcdir@
diff --git a/doc/Makefile.in b/doc/Makefile.in
index a2700d3c..689ddeec 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -55,6 +55,7 @@ CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
+CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -113,6 +114,7 @@ builddir = @builddir@
 cap_LIBS = @cap_LIBS@
 datadir = @datadir@
 datarootdir = @datarootdir@
+dejazilla = @dejazilla@
 docdir = @docdir@
 dvidir = @dvidir@
 elfutils_abs_srcdir = @elfutils_abs_srcdir@
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog
index 841dc8e3..e15f5b3d 100644
--- a/testsuite/ChangeLog
+++ b/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2008-05-24  Frank Ch. Eigler  <fche@elastic.org>
+
+	* configure.ac (enable-dejazilla): Add option, default off.
+	* Makefile.am (*check): Send systemtap.sum to dejazilla if enabled$a
+	* execrc: New helper script for runtest rc overriding.
+	* configure, Makefile.in: Regenerated.
+
 2008-05-23  Frank Ch. Eigler  <fche@elastic.org>
 
 	* buildok/{nfs,rpc}-all-probes.stp: Suppress warnings from empty probe
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index edaaff3c..aedfe447 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -3,16 +3,24 @@
 
 AUTOMAKE_OPTIONS = dejagnu
 
-# The stap symlink is to enable "#! stap" test scripts.
 all-local:
 	@echo Run \"make check\" or \"make installcheck\".
+	@if test -n "$(DEJAZILLA)"; then echo Test results will be emailed to $(DEJAZILLA); fi
 
 clean-local:
 	-rm -f ./stap site.exp systemtap.sum systemtap.log
 	-rm -rf .systemtap .cache_test 2>/dev/null
 
-installcheck-local: clean site.exp
-	$(MAKE) AM_RUNTESTFLAGS="--tool_opts install" check-DEJAGNU
+DEJAZILLA=@dejazilla@
+
+# automake's dejagnu library already runs check-DEJAGNU before check-local
+check-local:
+	if test -n "$(DEJAZILLA)"; then mail $(DEJAZILLA) < systemtap.sum; fi
+
+# but installcheck does not follow an implicit check-DEJAGNU, go figure
+installcheck: clean site.exp
+	-$(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU RUNTESTFLAGS="$(RUNTESTFLAGS) --tool_opts install"
+	if test -n "$(DEJAZILLA)"; then mail $(DEJAZILLA) < systemtap.sum; fi
 
 SRCDIR = $(shell cd $(srcdir); pwd)
 
@@ -30,4 +38,6 @@ LD_LIBRARY_PATH=$(DESTDIR)$(libdir)/systemtap
 CRASH_LIBDIR=$(DESTDIR)$(libdir)/systemtap
 SYSTEMTAP_PATH=$(DESTDIR)$(bindir)
 
-RUNTEST="env SYSTEMTAP_RUNTIME=$(SYSTEMTAP_RUNTIME) SYSTEMTAP_TAPSET=$(SYSTEMTAP_TAPSET) LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) CRASH_LIBDIR=$(CRASH_LIBDIR) PATH=$(SYSTEMTAP_PATH):$$PATH runtest"
+RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir
+EXPECT = expect
+RUNTEST="env SYSTEMTAP_RUNTIME=$(SYSTEMTAP_RUNTIME) SYSTEMTAP_TAPSET=$(SYSTEMTAP_TAPSET) LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) CRASH_LIBDIR=$(CRASH_LIBDIR) PATH=$(SYSTEMTAP_PATH):$$PATH $(srcdir)/execrc runtest"
diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
index 99acf141..2858d2bb 100644
--- a/testsuite/Makefile.in
+++ b/testsuite/Makefile.in
@@ -49,8 +49,6 @@ CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
 DEJATOOL = $(PACKAGE)
-RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir
-EXPECT = expect
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -107,6 +105,7 @@ build_alias = @build_alias@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
+dejazilla = @dejazilla@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
@@ -134,6 +133,7 @@ target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = dejagnu
+DEJAZILLA = @dejazilla@
 SRCDIR = $(shell cd $(srcdir); pwd)
 EXTRA_DIST = config lib systemtap \
 	parseok parseko semok semko transok transko buildok buildok \
@@ -149,7 +149,9 @@ SYSTEMTAP_TAPSET = $(DESTDIR)$(pkgdatadir)/tapset
 LD_LIBRARY_PATH = $(DESTDIR)$(libdir)/systemtap
 CRASH_LIBDIR = $(DESTDIR)$(libdir)/systemtap
 SYSTEMTAP_PATH = $(DESTDIR)$(bindir)
-RUNTEST = "env SYSTEMTAP_RUNTIME=$(SYSTEMTAP_RUNTIME) SYSTEMTAP_TAPSET=$(SYSTEMTAP_TAPSET) LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) CRASH_LIBDIR=$(CRASH_LIBDIR) PATH=$(SYSTEMTAP_PATH):$$PATH runtest"
+RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir
+EXPECT = expect
+RUNTEST = "env SYSTEMTAP_RUNTIME=$(SYSTEMTAP_RUNTIME) SYSTEMTAP_TAPSET=$(SYSTEMTAP_TAPSET) LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) CRASH_LIBDIR=$(CRASH_LIBDIR) PATH=$(SYSTEMTAP_PATH):$$PATH $(srcdir)/execrc runtest"
 all: all-am
 
 .SUFFIXES:
@@ -351,7 +353,7 @@ distcleancheck: distclean
 	       $(distcleancheck_listfiles) ; \
 	       exit 1; } >&2
 check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU
+	$(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU check-local
 check: check-am
 all-am: Makefile all-local
 installdirs:
@@ -362,8 +364,6 @@ uninstall: uninstall-am
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
@@ -414,7 +414,7 @@ install-pdf: install-pdf-am
 
 install-ps: install-ps-am
 
-installcheck-am: installcheck-local
+installcheck-am:
 
 maintainer-clean: maintainer-clean-am
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
@@ -439,30 +439,36 @@ uninstall-am:
 .MAKE: install-am install-strip
 
 .PHONY: all all-am all-local am--refresh check check-DEJAGNU check-am \
-	clean clean-generic clean-local dist dist-all dist-bzip2 \
-	dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
-	distclean-DEJAGNU distclean-generic distcleancheck distdir \
-	distuninstallcheck dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installcheck-local \
+	check-local clean clean-generic clean-local dist dist-all \
+	dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip distcheck \
+	distclean distclean-DEJAGNU distclean-generic distcleancheck \
+	distdir distuninstallcheck dvi dvi-am html html-am info \
+	info-am install install-am install-data install-data-am \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
 	uninstall-am
 
 
-# The stap symlink is to enable "#! stap" test scripts.
 all-local:
 	@echo Run \"make check\" or \"make installcheck\".
+	@if test -n "$(DEJAZILLA)"; then echo Test results will be emailed to $(DEJAZILLA); fi
 
 clean-local:
 	-rm -f ./stap site.exp systemtap.sum systemtap.log
 	-rm -rf .systemtap .cache_test 2>/dev/null
 
-installcheck-local: clean site.exp
-	$(MAKE) AM_RUNTESTFLAGS="--tool_opts install" check-DEJAGNU
+# automake's dejagnu library already runs check-DEJAGNU before check-local
+check-local:
+	if test -n "$(DEJAZILLA)"; then mail $(DEJAZILLA) < systemtap.sum; fi
+
+# but installcheck does not follow an implicit check-DEJAGNU, go figure
+installcheck: clean site.exp
+	-$(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU RUNTESTFLAGS="$(RUNTESTFLAGS) --tool_opts install"
+	if test -n "$(DEJAZILLA)"; then mail $(DEJAZILLA) < systemtap.sum; fi
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/testsuite/configure b/testsuite/configure
index bd8237cb..93494726 100755
--- a/testsuite/configure
+++ b/testsuite/configure
@@ -640,6 +640,7 @@ am__untar
 MAINTAINER_MODE_TRUE
 MAINTAINER_MODE_FALSE
 MAINT
+dejazilla
 LIBOBJS
 LTLIBOBJS'
 ac_subst_files=''
@@ -1223,6 +1224,11 @@ Optional Features:
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
+  --enable-dejazilla[=EMAIL]
+                          enable dejazilla support to automatically email test
+                          results to a central public collection point
+                          (default is disabled). Optional EMAIL overrides the
+                          default email address.
 
 Report bugs to <systemtap@sources.redhat.com>.
 _ACEOF
@@ -2160,6 +2166,22 @@ fi
 
 
 
+# Check whether --enable-dejazilla was given.
+if test "${enable_dejazilla+set}" = set; then
+  enableval=$enable_dejazilla;
+fi
+
+case "$enable_dejazilla" in
+     no) dejazilla= ;;
+     yes) dejazilla=dejazilla@elastic.org ;;
+     *) dejazilla="$enable_dejazilla" ;;
+esac
+if test -n "$dejazilla"; then
+   { echo "$as_me:$LINENO: A \"make *check\" will email results to $dejazilla" >&5
+echo "$as_me: A \"make *check\" will email results to $dejazilla" >&6;}
+fi
+
+
 ac_config_files="$ac_config_files Makefile"
 
 cat >confcache <<\_ACEOF
@@ -2861,11 +2883,12 @@ am__untar!$am__untar$ac_delim
 MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
 MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
 MAINT!$MAINT$ac_delim
+dejazilla!$dejazilla$ac_delim
 LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 64; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 65; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/testsuite/configure.ac b/testsuite/configure.ac
index 70d01e96..0fd78fe7 100644
--- a/testsuite/configure.ac
+++ b/testsuite/configure.ac
@@ -8,5 +8,20 @@ AC_CONFIG_AUX_DIR(..)
 AM_INIT_AUTOMAKE([dejagnu foreign])
 AM_MAINTAINER_MODE
 
+AC_ARG_ENABLE([dejazilla],
+  AS_HELP_STRING([--enable-dejazilla@<:@=EMAIL@:>@],
+    [enable dejazilla support to automatically email test results to a
+     central public collection point (default is disabled).  Optional
+     EMAIL overrides the default email address.]))
+case "$enable_dejazilla" in
+     no) dejazilla= ;;
+     yes) dejazilla=dejazilla@elastic.org ;;
+     *) dejazilla="$enable_dejazilla" ;;
+esac
+if test -n "$dejazilla"; then
+   AC_MSG_NOTICE([A "make *check" will email results to $dejazilla])
+fi
+AC_SUBST(dejazilla)
+
 AC_CONFIG_FILES(Makefile)
 AC_OUTPUT
diff --git a/testsuite/execrc b/testsuite/execrc
new file mode 100755
index 00000000..deff87e7
--- /dev/null
+++ b/testsuite/execrc
@@ -0,0 +1,5 @@
+#! /bin/sh
+
+# Run given program, but return a successful rc anyway.
+eval $@
+exit 0