diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-10-10 20:30:21 +0200 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2011-10-11 16:40:12 +0200 |
| commit | 366adeb73d80cbe8ed4b730c46ed7864cf10eb73 (patch) | |
| tree | 4026ce189d5381bf9f01beb63e919493976162d2 | |
| parent | 7508234eabe646abcea074baea83612f8115d3b9 (diff) | |
| download | diffutils-366adeb73d80cbe8ed4b730c46ed7864cf10eb73.tar.gz | |
tests: make test runner a script, not a shell function
All the test scripts in the diffutils 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/binary: Make executable.
* tests/colliding-file-names: Likewise.
* tests/excess-slash: Likewise.
* tests/no-newline-at-eof: Likewise.
| -rw-r--r-- | tests/Makefile.am | 19 | ||||
| -rwxr-xr-x[-rw-r--r--] | tests/binary | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | tests/colliding-file-names | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | tests/excess-slash | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | tests/no-newline-at-eof | 0 |
5 files changed, 3 insertions, 16 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 582f976..9835ab6 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -22,21 +22,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 \ VERSION='$(VERSION)' \ abs_top_builddir='$(abs_top_builddir)' \ @@ -55,7 +40,9 @@ TESTS_ENVIRONMENT = \ PREFERABLY_POSIX_SHELL='$(PREFERABLY_POSIX_SHELL)' \ REPLACE_GETCWD=$(REPLACE_GETCWD) \ PATH='$(abs_top_builddir)/src$(PATH_SEPARATOR)'"$$PATH" \ - ; shell_or_perl_ + ; + +LOG_COMPILER= $(SHELL) built_programs = \ echo 'spy:;@echo $$(PROGRAMS)' \ diff --git a/tests/binary b/tests/binary index e163f01..e163f01 100644..100755 --- a/tests/binary +++ b/tests/binary diff --git a/tests/colliding-file-names b/tests/colliding-file-names index 964d026..964d026 100644..100755 --- a/tests/colliding-file-names +++ b/tests/colliding-file-names diff --git a/tests/excess-slash b/tests/excess-slash index 32ffc89..32ffc89 100644..100755 --- a/tests/excess-slash +++ b/tests/excess-slash diff --git a/tests/no-newline-at-eof b/tests/no-newline-at-eof index 6052206..6052206 100644..100755 --- a/tests/no-newline-at-eof +++ b/tests/no-newline-at-eof |