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.

diff --git a/Makefile.SH b/Makefile.SH
index c1d31f4..a1c1422 100755 (executable)
--- 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 (executable)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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};