testsuite: finish removing dejazilla artifacts, restoring dejagnu *check rc

Way back during early dejazilla days, the "check-local" target was
needed in order to liberate test results, regardless of pass/failure
of the dejagnu suite.  To make that work, an "execrc" wrapper was
interposed between make and dejagnu/runtest, to turn everything into
a pass rc=0.

Dejagnu support was removed in 2022, so this execrc hack is not needed
any more.  Tests that fail, especially the early
systemtap.base/environment_sanity.exp one, should stand out better
in buildbot reports.

diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 5c2b8e517aa4d555bf21aec1ebdb339da501661e..008fbcb475cc674da3d1c962730e2475f1d0c873 100644 (file)
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -40,11 +40,6 @@ SKIPTESTS=--ignore \'$(shell \
          sed 's/\ $$/\n/' \
        )\'
 
-# automake's dejagnu library already runs check-DEJAGNU before check-local
-# That's why we need to add "execrc" to $(RUNTEST) - to ensure that this
-# subtarget gets run even if runtest per se exits with a failure.
-check-local:
-
 # but installcheck does not follow an implicit check-DEJAGNU, go figure
 installcheck: site.exp
        -rm -rf artifacts
@@ -70,7 +65,7 @@ installcheck-parallel: site.exp
        -test -z $(SYSTEMTAP_TESTSUITE_RESUME) && $(MAKE) clean && $(MAKE) site.exp
        -rmmod uprobes 2>/dev/null
        mkdir -p artifacts/__serialtests
-       MAKEFLAGS= $(RUNTEST2) systemtap.base/environment_sanity.exp
+       MAKEFLAGS= $(RUNTEST) systemtap.base/environment_sanity.exp
        -$(MAKE) -k do-installcheck-parallel; \
        result=$$?; \
        $(SHELL) $(srcdir)/dg-extract-results.sh \
@@ -169,5 +164,4 @@ SYSCONFDIR=@sysconfdir@
 
 RUNTESTDEFAULTFLAGS = --tool $$tool --tool_opts \'$(TOOL_OPTS)\' --srcdir $(shell readlink -f $(srcdir))
 EXPECT = expect
-RUNTEST= env --unset=DEBUGINFOD_VERBOSE --unset=DEBUGINFOD_PROGRESS XDG_DATA_DIRS= SYSTEMTAP_SYNC=1 LANG=C SYSTEMTAP_TESTREMOTES=$(TESTREMOTES) SYSTEMTAP_TESTAPPS=$(TESTAPPS) SYSTEMTAP_RUNTIME=$(SYSTEMTAP_RUNTIME) SYSTEMTAP_TAPSET=$(SYSTEMTAP_TAPSET) CRASH_LIBDIR=$(CRASH_LIBDIR) PATH=$(SYSTEMTAP_PATH):$(SYSTEMTAP_SPATH):$$PATH SYSTEMTAP_PATH=$(SYSTEMTAP_PATH) SYSTEMTAP_SPATH=$(SYSTEMTAP_SPATH) SYSTEMTAP_INCLUDES=$(SYSTEMTAP_INCLUDES) PKGLIBDIR=$(pkglibexecdir) PYTHON=$(PYTHON) PYEXECDIR=$(PYEXECDIR) PYTHON3=$(PYTHON3) PY3EXECDIR=$(PY3EXECDIR) SYSCONFDIR=$(SYSCONFDIR) $(srcdir)/execrc runtest
-RUNTEST2= env --unset=DEBUGINFOD_VERBOSE --unset=DEBUGINFOD_PROGRESS XDG_DATA_DIRS= SYSTEMTAP_SYNC=1 LANG=C SYSTEMTAP_TESTREMOTES=$(TESTREMOTES) SYSTEMTAP_TESTAPPS=$(TESTAPPS) SYSTEMTAP_RUNTIME=$(SYSTEMTAP_RUNTIME) SYSTEMTAP_TAPSET=$(SYSTEMTAP_TAPSET) CRASH_LIBDIR=$(CRASH_LIBDIR) PATH=$(SYSTEMTAP_PATH):$(SYSTEMTAP_SPATH):$$PATH SYSTEMTAP_PATH=$(SYSTEMTAP_PATH) SYSTEMTAP_SPATH=$(SYSTEMTAP_SPATH) SYSTEMTAP_INCLUDES=$(SYSTEMTAP_INCLUDES) PKGLIBDIR=$(pkglibexecdir) PYTHON=$(PYTHON) PYEXECDIR=$(PYEXECDIR) PYTHON3=$(PYTHON3) PY3EXECDIR=$(PY3EXECDIR) SYSCONFDIR=$(SYSCONFDIR) runtest
+RUNTEST= env --unset=DEBUGINFOD_VERBOSE --unset=DEBUGINFOD_PROGRESS XDG_DATA_DIRS= SYSTEMTAP_SYNC=1 LANG=C SYSTEMTAP_TESTREMOTES=$(TESTREMOTES) SYSTEMTAP_TESTAPPS=$(TESTAPPS) SYSTEMTAP_RUNTIME=$(SYSTEMTAP_RUNTIME) SYSTEMTAP_TAPSET=$(SYSTEMTAP_TAPSET) CRASH_LIBDIR=$(CRASH_LIBDIR) PATH=$(SYSTEMTAP_PATH):$(SYSTEMTAP_SPATH):$$PATH SYSTEMTAP_PATH=$(SYSTEMTAP_PATH) SYSTEMTAP_SPATH=$(SYSTEMTAP_SPATH) SYSTEMTAP_INCLUDES=$(SYSTEMTAP_INCLUDES) PKGLIBDIR=$(pkglibexecdir) PYTHON=$(PYTHON) PYEXECDIR=$(PYEXECDIR) PYTHON3=$(PYTHON3) PY3EXECDIR=$(PY3EXECDIR) SYSCONFDIR=$(SYSCONFDIR) runtest

diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
index 3e53ccc2d2c14aec35b5aa0aee9297eb1e59acdd..abd21e69e75fa457625cd30ce622e3dc69c6700e 100644 (file)
--- a/testsuite/Makefile.in
+++ b/testsuite/Makefile.in
@@ -284,8 +284,7 @@ PY3EXECDIR = @py3execdir@
 SYSCONFDIR = @sysconfdir@
 RUNTESTDEFAULTFLAGS = --tool $$tool --tool_opts \'$(TOOL_OPTS)\' --srcdir $(shell readlink -f $(srcdir))
 EXPECT = expect
-RUNTEST = env --unset=DEBUGINFOD_VERBOSE --unset=DEBUGINFOD_PROGRESS XDG_DATA_DIRS= SYSTEMTAP_SYNC=1 LANG=C SYSTEMTAP_TESTREMOTES=$(TESTREMOTES) SYSTEMTAP_TESTAPPS=$(TESTAPPS) SYSTEMTAP_RUNTIME=$(SYSTEMTAP_RUNTIME) SYSTEMTAP_TAPSET=$(SYSTEMTAP_TAPSET) CRASH_LIBDIR=$(CRASH_LIBDIR) PATH=$(SYSTEMTAP_PATH):$(SYSTEMTAP_SPATH):$$PATH SYSTEMTAP_PATH=$(SYSTEMTAP_PATH) SYSTEMTAP_SPATH=$(SYSTEMTAP_SPATH) SYSTEMTAP_INCLUDES=$(SYSTEMTAP_INCLUDES) PKGLIBDIR=$(pkglibexecdir) PYTHON=$(PYTHON) PYEXECDIR=$(PYEXECDIR) PYTHON3=$(PYTHON3) PY3EXECDIR=$(PY3EXECDIR) SYSCONFDIR=$(SYSCONFDIR) $(srcdir)/execrc runtest
-RUNTEST2 = env --unset=DEBUGINFOD_VERBOSE --unset=DEBUGINFOD_PROGRESS XDG_DATA_DIRS= SYSTEMTAP_SYNC=1 LANG=C SYSTEMTAP_TESTREMOTES=$(TESTREMOTES) SYSTEMTAP_TESTAPPS=$(TESTAPPS) SYSTEMTAP_RUNTIME=$(SYSTEMTAP_RUNTIME) SYSTEMTAP_TAPSET=$(SYSTEMTAP_TAPSET) CRASH_LIBDIR=$(CRASH_LIBDIR) PATH=$(SYSTEMTAP_PATH):$(SYSTEMTAP_SPATH):$$PATH SYSTEMTAP_PATH=$(SYSTEMTAP_PATH) SYSTEMTAP_SPATH=$(SYSTEMTAP_SPATH) SYSTEMTAP_INCLUDES=$(SYSTEMTAP_INCLUDES) PKGLIBDIR=$(pkglibexecdir) PYTHON=$(PYTHON) PYEXECDIR=$(PYEXECDIR) PYTHON3=$(PYTHON3) PY3EXECDIR=$(PY3EXECDIR) SYSCONFDIR=$(SYSCONFDIR) runtest
+RUNTEST = env --unset=DEBUGINFOD_VERBOSE --unset=DEBUGINFOD_PROGRESS XDG_DATA_DIRS= SYSTEMTAP_SYNC=1 LANG=C SYSTEMTAP_TESTREMOTES=$(TESTREMOTES) SYSTEMTAP_TESTAPPS=$(TESTAPPS) SYSTEMTAP_RUNTIME=$(SYSTEMTAP_RUNTIME) SYSTEMTAP_TAPSET=$(SYSTEMTAP_TAPSET) CRASH_LIBDIR=$(CRASH_LIBDIR) PATH=$(SYSTEMTAP_PATH):$(SYSTEMTAP_SPATH):$$PATH SYSTEMTAP_PATH=$(SYSTEMTAP_PATH) SYSTEMTAP_SPATH=$(SYSTEMTAP_SPATH) SYSTEMTAP_INCLUDES=$(SYSTEMTAP_INCLUDES) PKGLIBDIR=$(pkglibexecdir) PYTHON=$(PYTHON) PYEXECDIR=$(PYEXECDIR) PYTHON3=$(PYTHON3) PY3EXECDIR=$(PY3EXECDIR) SYSCONFDIR=$(SYSCONFDIR) runtest
 all: all-am
 
 .SUFFIXES:
@@ -367,7 +366,7 @@ distclean-DEJAGNU:
          rm -f $$tool.sum $$tool.log; \
        done
 check-am: all-am
-       $(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU check-local
+       $(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU
 check: check-am
 all-am: Makefile all-local
 installdirs:
@@ -471,14 +470,14 @@ uninstall-am:
 .MAKE: check-am install-am install-strip
 
 .PHONY: all all-am all-local am--refresh check check-DEJAGNU check-am \
-       check-local clean clean-generic clean-local cscopelist-am \
-       ctags-am distclean distclean-DEJAGNU distclean-generic 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 \
+       clean clean-generic clean-local cscopelist-am ctags-am \
+       distclean distclean-DEJAGNU distclean-generic 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 tags-am uninstall uninstall-am
 
@@ -498,11 +497,6 @@ clean-local:
        -rm -f uprobe_*
        -rm -rf artifacts
 
-# automake's dejagnu library already runs check-DEJAGNU before check-local
-# That's why we need to add "execrc" to $(RUNTEST) - to ensure that this
-# subtarget gets run even if runtest per se exits with a failure.
-check-local:
-
 # but installcheck does not follow an implicit check-DEJAGNU, go figure
 installcheck: site.exp
        -rm -rf artifacts
@@ -527,7 +521,7 @@ installcheck-parallel: site.exp
        -test -z $(SYSTEMTAP_TESTSUITE_RESUME) && $(MAKE) clean && $(MAKE) site.exp
        -rmmod uprobes 2>/dev/null
        mkdir -p artifacts/__serialtests
-       MAKEFLAGS= $(RUNTEST2) systemtap.base/environment_sanity.exp
+       MAKEFLAGS= $(RUNTEST) systemtap.base/environment_sanity.exp
        -$(MAKE) -k do-installcheck-parallel; \
        result=$$?; \
        $(SHELL) $(srcdir)/dg-extract-results.sh \

diff --git a/testsuite/execrc b/testsuite/execrc
deleted file mode 100755 (executable)
index deff87e..0000000
--- a/testsuite/execrc
+++ /dev/null
@@ -1,5 +0,0 @@
-#! /bin/sh
-
-# Run given program, but return a successful rc anyway.
-eval $@
-exit 0