[PATCH 2/8] tests: remove recipes that run tests with 'prove'

[Stefano Lattarini]

Those recipes has served its purpose by helping us during the
development of TAP support in Automake, to ensure our TAP driver
didn't have gratuitous incompatibilities with the 'prove' test
runner.  But they are now unused, out-of-date and bitrotting.  So
it's better to just remove them.  We can resurrect them at a later
time if the need arises.

* tests/Makefile.am (PROVE, AM_PROVEFLAGS, AM_PROVECMD): Remove
these variables.
(prove, installprove): Remove these targets and their recipe.
(EXTRA_DIST): Don't distribute 'ax/prove-runner' anymore.
* ax/prove-runner: Delete.

Signed-off-by: Stefano Lattarini <address@hidden>
---
 tests/Makefile.am     |   83 -------------------------------------------------
 tests/ax/prove-runner |   65 --------------------------------------
 2 files changed, 0 insertions(+), 148 deletions(-)
 delete mode 100755 tests/ax/prove-runner

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8ebd31b..5cb478e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -192,86 +192,3 @@ clean-local-check:
           find "$$@" -type d ! -perm -700 -exec chmod u+rwx {} ';'; \
           rm -rf "$$@"; \
         fi;
-
-## Run the testsuite through the 'prove' utility.  Mostly for maintainers,
-## and to find out possible incompatibilities between 'prove' and the
-## Automake own TAP driver.
-
-PROVE = prove
-AM_PROVEFLAGS = --timer
-AM_PROVECMD = \
-  test -z "$$tests" || \
-    { \
-      $(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) \
-      $(PROVE) $(AM_PROVEFLAGS) -e $(srcdir)/ax/prove-runner $(PROVEFLAGS) \
-      $$tests $(AM_TESTS_FD_REDIRECT); \
-    }
-
-EXTRA_DIST += ax/prove-runner
-
-.PHONY: prove installprove
-prove installprove: $(TESTS) ax/prove-runner defs-static
-       @exit_status=0; \
-## The testsuite can be run either using the automake build tree or
-## the already-installed automake package.
-       case '$@' in \
-         install*) am_running_installcheck=yes;; \
-         *) am_running_installcheck=no;; \
-       esac; \
-       export am_running_installcheck; \
-## XXX Our poor-man way to handle inter-tests dependencies without the
-## XXX help of make.  This is obviously fragile and doesn't scale,
-## XXX but for now it's good enough since we have only one possible
-## XXX inter-tests dependency at the moment.
-       need_tap_common_setup=no; \
-       lst=' $(TESTS) '; for t in $$lst; do \
-         case ' $(on_tap_with_common_setup_TESTS) ' in \
-           *" $$t "*) need_tap_common_setup=yes; break;; \
-         esac; \
-       done; \
-## For VPATH builds.
-       if test $$need_tap_common_setup = yes; then \
-         t=tap-common-setup.test; \
-         if test -f ./$$t; then \
-           tests=./$$t; \
-         else \
-           tests=$(srcdir)/$$t; \
-         fi; \
-## Do not stop if there's a failure here, we want to run the following
-## tests anyway.
-         echo "$@: running pre-requisite tests ..."; \
-         $(AM_PROVECMD) || exits_status=$$?; \
-         echo "$@: done.  We'll shortly run the main testsuite."; \
-       fi; \
-## Handle VPATH builds, and ensure that the tests have a properly
-## qualified path.
-       tests=`\
-         for t in $(TESTS); do \
-## XXX In next line, another hack for inter-tests dependencies: this
-## XXX can't run concurrently to the tests that use the data files it
-## XXX generates.
-           case "$$need_tap_common_setup,/$$t" in \
-             yes,*/tap-common-setup.test) continue;; \
-           esac; \
-           if test -f ./$$t; then \
-             echo ./$$t; \
-           else \
-             echo $(srcdir)/$$t; \
-           fi; \
-         done`; \
-## Extra environment, mostly for use by 'prove-runner'.
-## XFAIL_TESTS gets normalized to play nicer with VPATH builds.
-       XFAIL_TESTS=`\
-         for t in $(XFAIL_TESTS); do \
-           echo $$t; echo ./$$t; echo $(srcdir)/$$t; \
-         done | LC_ALL=C sort | uniq`; \
-       XFAIL_TESTS=`echo $$XFAIL_TESTS`; \
-       TAP_RUNNER='$(TAP_LOG_COMPILE)' \
-       TEST_RUNER='$(TEST_LOG_COMPILE)' \
-       export XFAIL_TESTS TAP_RUNNER TEST_RUNNER; \
-## For consistency with the Automake testsuite harness, that exports
-## this unconditionally in the test scripts' environment.
-       srcdir='$(srcdir)'; export srcdir; \
-## Here we go.
-       $(AM_PROVECMD) || exit_status=$$?; \
-       exit $$exit_status;
diff --git a/tests/ax/prove-runner b/tests/ax/prove-runner
deleted file mode 100755
index 33dab19..0000000
--- a/tests/ax/prove-runner
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/sh
-# Helper script to run the automake testsuite through the `prove' utility.
-# See the "prove" and "installprove" targets in tests/Makefile.am.
-
-# Copyright (C) 2012 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-set -u
-
-nl='
-'
-
-tst=$1
-shift
-
-case $tst in
-  *.test)
-    echo 1..1
-    # Protect the output contents of the test script, since it might
-    # sometimes contain TAP lines that would confuse `prove'.  This
-    # has already happened in practice, especially for the tests
-    # checking TAP support in automake-generated test harnesses.
-    (${TEST_RUNNER-} "$tst" ${1+"$@"}; echo exit status: $?) 2>&1 | awk '
-      BEGIN { lastine = "exit status: 255"; }
-      { print " " $0; lastline = $0; }
-      END { st = lastline; sub("^exit status: *", "", st); exit st; }
-    '
-    st=$?
-    if test $st -eq 99; then
-      echo "not ok - $tst: hard failure (exit status $st)"
-    elif test $st -eq 77; then
-      echo "ok - $tst # SKIP"
-    else
-      case " ${XFAIL_TESTS-} " in
-        *" $tst "*) xs=' # TODO';;
-        *) xs='';;
-      esac
-      if test $st -eq 0; then
-        echo "ok - test script $tst passed$xs"
-      else
-        echo "not ok - test script $tst failed (exit status $st)$xs"
-      fi
-    fi
-    exit 0
-    ;;
-  *.tap)
-    ${TAP_RUNNER-} "$tst" ${1+"$@"} 2>&1
-    exit $?
-    ;;
-esac
-
-echo "Bail out! Invalid test script name '$tst'"
-exit 99
-- 
1.7.9