In perl.git, the branch smoke-me/nicholas/Makefile-target-purge has been updated
<http://perl5.git.perl.org/perl.git/commitdiff/377b601448295220ef59eebb04a7b35e5db7aee8?hp=b75dc5c4d9d0a5cdcdd3578a984036e0c0008d80> - Log ----------------------------------------------------------------- commit 377b601448295220ef59eebb04a7b35e5db7aee8 Author: Nicholas Clark <n...@ccl4.org> Date: Wed Jun 19 21:39:39 2013 +0200 We don't actually need to set $ENV{PERL} for the tests to work. Whatever the executable is named at the top level, it's always symlinked as ./perl in t, so there's no need to set an environment variable to override the expected name. ----------------------------------------------------------------------- Summary of changes: Makefile.SH | 2 +- runtests.SH | 9 ++------- t/op/magic.t | 2 +- t/run/runenv.t | 2 +- t/win32/runenv.t | 2 +- 5 files changed, 6 insertions(+), 11 deletions(-) diff --git a/Makefile.SH b/Makefile.SH index aac6500..f18c315 100755 --- a/Makefile.SH +++ b/Makefile.SH @@ -1392,7 +1392,7 @@ depend: makedepend _test: echo >&2 The _test target is deprecated. Please upgrade your smoker - PERL=./perl $(RUN_TESTS) choose + $(RUN_TESTS) choose # Cannot delegate rebuilding of t/perl to make # to allow interlaced test and minitest diff --git a/runtests.SH b/runtests.SH index 24e1ffa..304b719 100755 --- a/runtests.SH +++ b/runtests.SH @@ -54,19 +54,14 @@ if test X"\$TESTFILE" = X; then TESTFILE=TEST fi -if test X"\$PERL" = X; then - PERL=./perl$_exe - export PERL -fi - cd t # The second branch is for testing without a tty or controlling terminal, # see t/op/stat.t if test \$tty = Y; then - \$PERL \$TESTFILE \$TEST_ARGS \$TEST_FILES </dev/tty + ./perl$_exe \$TESTFILE \$TEST_ARGS \$TEST_FILES </dev/tty else - PERL_SKIP_TTY_TEST=1 \$PERL \$TESTFILE \$TEST_ARGS \$TEST_FILES + PERL_SKIP_TTY_TEST=1 ./perl$_exe \$TESTFILE \$TEST_ARGS \$TEST_FILES fi echo "Ran tests" > rantests diff --git a/t/op/magic.t b/t/op/magic.t index fc7e205..7abddbe 100644 --- a/t/op/magic.t +++ b/t/op/magic.t @@ -56,7 +56,7 @@ $Is_Dos = $^O eq 'dos'; $Is_os2 = $^O eq 'os2'; $Is_Cygwin = $^O eq 'cygwin'; -$PERL = $ENV{PERL} || +$PERL = ($Is_NetWare ? 'perl' : $Is_VMS ? $^X : $Is_MSWin32 ? '.\perl' : diff --git a/t/run/runenv.t b/t/run/runenv.t index b3df796..9380d24 100644 --- a/t/run/runenv.t +++ b/t/run/runenv.t @@ -16,7 +16,7 @@ plan tests => 104; my $STDOUT = tempfile(); my $STDERR = tempfile(); -my $PERL = $ENV{PERL} || './perl'; +my $PERL = './perl'; my $FAILURE_CODE = 119; delete $ENV{PERLLIB}; diff --git a/t/win32/runenv.t b/t/win32/runenv.t index b2d7895..d487ea7 100644 --- a/t/win32/runenv.t +++ b/t/win32/runenv.t @@ -28,7 +28,7 @@ skip_all "requires compilation with PERL_IMPLICIT_SYS" plan tests => $::tests; -my $PERL = $ENV{PERL} || '.\perl'; +my $PERL = '.\perl'; my $NL = $/; delete $ENV{PERLLIB}; -- Perl5 Master Repository
