All the test scripts in the gzip testsuite are shell scripts, so the current definition of TESTS_ENVIRONMENT, which adaptively run tests using either perl or the shell depending on their kind, is an overkill.
Moreover, this change is required in order for the testsuite to continue to work with the new testsuite harness that is planned to be introduced in Automake 1.12 (which, as of the writing date, is still under development and in late alpha state). See also related discussion on bug-coreutils: <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8887> * tests/Makefile.am (TESTS_ENVIRONMENT): Remove definition of the `shell_or_perl_' shell function, which is not required anymore. (LOG_COMPILER): New, define to `$(SHELL)'. * tests/mixed: Make executable. * tests/zgrep-f: Likewise. * tests/zgrep-signal: Likewise. * tests/znew-k: Likewise. --- tests/Makefile.am | 17 +---------------- 1 files changed, 1 insertions(+), 16 deletions(-) mode change 100644 => 100755 tests/mixed mode change 100644 => 100755 tests/zgrep-f mode change 100644 => 100755 tests/zgrep-signal mode change 100644 => 100755 tests/znew-k diff --git a/tests/Makefile.am b/tests/Makefile.am index cb7f94a..0bf072f 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -53,21 +53,6 @@ TESTS_ENVIRONMENT = \ tmp__=$$TMPDIR; test -d "$$tmp__" || tmp__=.; \ TMPDIR=$$tmp__; export TMPDIR; \ exec 9>&2; \ - shell_or_perl_() { \ - if grep '^\#!/usr/bin/perl' "$$1" > /dev/null; then \ - if $(PERL) -e 'use warnings' > /dev/null 2>&1; then \ - grep '^\#!/usr/bin/perl -T' "$$1" > /dev/null && T_=T || T_=; \ - $(PERL) -w$$T_ -I$(srcdir) -MCoreutils \ - -M"CuTmpdir qw($$f)" -- "$$1"; \ - else \ - echo 1>&2 "$$tst: configure did not find a usable version of Perl," \ - "so skipping this test"; \ - (exit 77); \ - fi; \ - else \ - $(SHELL) "$$1"; \ - fi; \ - }; \ export \ LC_ALL=C \ VERSION=$(VERSION) \ @@ -85,6 +70,6 @@ TESTS_ENVIRONMENT = \ PERL='$(PERL)' \ SHELL='$(SHELL)' \ PATH='$(abs_top_builddir)$(PATH_SEPARATOR)'"$$PATH" \ - ; shell_or_perl_ + ; VERBOSE = yes diff --git a/tests/mixed b/tests/mixed old mode 100644 new mode 100755 diff --git a/tests/zgrep-f b/tests/zgrep-f old mode 100644 new mode 100755 diff --git a/tests/zgrep-signal b/tests/zgrep-signal old mode 100644 new mode 100755 diff --git a/tests/znew-k b/tests/znew-k old mode 100644 new mode 100755 -- 1.7.2.3
