diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-08-30 14:13:13 +0200 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2012-08-30 18:55:59 +0200 |
| commit | 4af32c62fa58570a97d705fc0340704e9faa1a1f (patch) | |
| tree | 92185cce051fef767028af7b8cc9a7f9298b83f5 /tests/Makefile.am | |
| parent | 9eb4c31eb78c28dd9f72d1cbb940270311be343c (diff) | |
| download | coreutils-4af32c62fa58570a97d705fc0340704e9faa1a1f.tar.xz | |
tests: get rid of the 'shell-or-perl' auxiliary script
It's now easier and faster to simply run the perl ans shell test
scripts directly with the appropriate interpreter and options.
* tests/shell-or-perl: Delete.
* tests/Makefile.am (EXTRA_DIST): Remove it.
(SH_LOG_COMPILER): Re-define to invoke the correct shell.
(PL_LOG_COMPILER): Re-define to invoke the correct perl
interpreter ...
(TESTSUITE_PERL_OPTIONS): ... with the correct options.
(XPL_LOG_COMPILER): Use those options instead of inlining
their expansion.
(LOG_COMPILER): Delete, no longer needed.
Diffstat (limited to 'tests/Makefile.am')
| -rw-r--r-- | tests/Makefile.am | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index a547b1181..bc3d30892 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -53,22 +53,19 @@ else TESTSUITE_PERL = $(SHELL) $(srcdir)/no-perl endif +# Options passed to the perl invocations running the perl test scripts. +TESTSUITE_PERL_OPTIONS = -w -I$(srcdir) -MCoreutils -MCuSkip # '$f' is set by the Automake-generated test harness to the path of the # current test script stripped of VPATH components, and is used by the -# shell-or-perl script to determine the name of the temporary files to be -# used. Note that $f is a shell variable, not a make macro, so the use of -# '$$f' below is correct, and not a typo. -LOG_COMPILER = \ - $(SHELL) $(srcdir)/shell-or-perl \ - --test-name "$$f" --srcdir '$(srcdir)' \ - --shell '$(SHELL)' --perl '$(TESTSUITE_PERL)' -- - -PL_LOG_COMPILER = $(LOG_COMPILER) -SH_LOG_COMPILER = $(LOG_COMPILER) +# CuTmpdir module to determine the name of the temporary files to be +# used. Note that $f is a shell variable, not a make macro, so the use +# of '$$f' below is correct, and not a typo. +TESTSUITE_PERL_OPTIONS += -M"CuTmpdir qw($$f)" +SH_LOG_COMPILER = $(SHELL) +PL_LOG_COMPILER = $(TESTSUITE_PERL) $(TESTSUITE_PERL_OPTIONS) # Perl scripts that must be run in tainted mode. -XPL_LOG_COMPILER = \ - $(TESTSUITE_PERL) -wT -I$(srcdir) -MCoreutils -MCuSkip -M"CuTmpdir qw($$f)" +XPL_LOG_COMPILER = $(TESTSUITE_PERL) -T $(TESTSUITE_PERL_OPTIONS) # Note that the first lines are statements. They ensure that environment # variables that can perturb tests are unset or set to expected values. @@ -130,7 +127,6 @@ EXTRA_DIST = \ no-perl \ other-fs-tmpdir \ sample-test \ - shell-or-perl \ $(pr_data) root_tests = \ |