In perl.git, the branch blead has been updated
<http://perl5.git.perl.org/perl.git/commitdiff/6fb687a82f7642155c104cfe96d6eb6f090ba803?hp=dc127417deebfc7fa7fe52b0b01d97bec81a6b86>
- Log -----------------------------------------------------------------
commit 6fb687a82f7642155c104cfe96d6eb6f090ba803
Merge: dc12741 eca6ff4
Author: Nicholas Clark <n...@ccl4.org>
Date: Mon Jul 1 11:40:12 2013 +0200
Merge the branch that purged various under-used Makefile targets.
commit eca6ff41918b5c2539e82069cd31136ac719a11f
Author: Nicholas Clark <n...@ccl4.org>
Date: Mon Jul 1 11:39:39 2013 +0200
Document the removed Makefile targets in perldelta.
M pod/perldelta.pod
commit 6f134219e62f92d49164bd77a437b3998fcc8288
Author: Nicholas Clark <n...@ccl4.org>
Date: Thu Jun 20 16:46:05 2013 +0200
In perlhacktips, suggest a shell loop to generate all .gcov files.
M pod/perlhacktips.pod
commit e2aed43d53a90809e8b0dc1655d7a69ee8220f61
Author: Nicholas Clark <n...@ccl4.org>
Date: Thu Jun 20 13:52:15 2013 +0200
Eliminate the perl.gprof and perl.gcov Makefile targets.
I don't feel that it's worthwhile having specific named targets for
building named binaries for use with gprof and gcov given that one has to
(re)Configure with the appropriate C compiler flags, hence all the object
files and the F<perl> that the build tree would build are just as enabled
(or contaminated) with profiling code as the specially named binary.
Update the documentation on using gprof and gcov to reflect that the binary
named F<perl> is now the binary that is profiled.
M Makefile.SH
M pod/perlhacktips.pod
commit 4dd5614820bd4af2d4613fb8ba075238034162e6
Author: Nicholas Clark <n...@ccl4.org>
Date: Thu Jun 20 11:00:34 2013 +0200
Run Porting/podtidy on pod/perlhacktips.pod
M pod/perlhacktips.pod
commit 5dfc6e973505ce7c3161caff6b99353561b13f1a
Author: Nicholas Clark <n...@ccl4.org>
Date: Thu Jun 20 10:51:17 2013 +0200
Update perlhacktips to note that Address Sanitizer is now also in gcc 4.8
Also s/linux/Linux/ in two places.
M pod/perlhacktips.pod
commit d8651d0de107495ba4bf747ca0e15b58988209aa
Author: Nicholas Clark <n...@ccl4.org>
Date: Thu Jun 20 10:15:31 2013 +0200
In perlhacktips, no need to give 3 ways to set an environment variable.
M pod/perlhacktips.pod
commit 16fb77a82988e440fb4a6adad6c5fe7b09512f14
Author: Nicholas Clark <n...@ccl4.org>
Date: Thu Jun 20 10:01:20 2013 +0200
Remove the explicit purify/quantify/purecov targets and documentation.
It's not clear whether IBM still sell quantify or purecov. They still seem
to sell purify, but I'm not sure if anyone is using it these days to detect
bugs in perl.
This doesn't prevent anyone from using these tools if they have them, as
it's still possible to run the commands by "hand". But by removing probably
unused code and documentation, the signal to noise ratio improves.
M Makefile.SH
M Porting/pumpkin.pod
M pod/perlhacktips.pod
commit 463c96de11efb9662169e0bf06f1faf33464a4cf
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.
M Makefile.SH
M runtests.SH
M t/op/magic.t
M t/run/runenv.t
M t/win32/runenv.t
commit b1343c5992fbc6e183c4dd851533181a7d0c63c5
Author: Nicholas Clark <n...@ccl4.org>
Date: Wed Jun 19 21:13:45 2013 +0200
valgrind doesn't require that perl was built with -g, so remove the check.
C<make test.valgrind> will run quite happily on a perl built with
optimisation and without debugging symbols. So don't enforce -g.
M Makefile.SH
commit 344479a01ad9619a52172a45e64fa926abcf8955
Author: Nicholas Clark <n...@ccl4.org>
Date: Wed Jun 19 14:09:55 2013 +0200
Inline the Makefile target minitest.prep into its only user.
This is strictly a refactoring, so do not change the rules themselves,
despite
them being ugly and fragile.
M Makefile.SH
commit f01ecde888eb7fbeac3d61f1428d7a2e3f3e930f
Author: Nicholas Clark <n...@ccl4.org>
Date: Wed Jun 19 13:37:25 2013 +0200
Remove Makefile targets and tools related to Irix and Tru64 debugging tools.
Remove the targets:
perl.pixie perl.pixie.atom perl.pixie.config perl.pixie.irix perl.third
perl.third.config
It's still possible to run the actions these targets "by hand", if desired.
This commit removes the convenience targets from the Makefile, reducing its
complexity. It also removes the related support scripts testall.atom and
thirdclean from Porting/
pixie is a performance analysis tool for Irix and Tru64
Third Degree is a memory checker tool for Tru64
Given that Tru64 went out of support at the end of 2012, and Irix goes out
of support at the end of 2013, it's very unlikely that anyone is still
actively profiling or debugging perl on either platform, and hence using
these targets. It's been several years since we've even had a regular bug
report from either platform.
M MANIFEST
M Makefile.SH
M Porting/README.pod
D Porting/testall.atom
D Porting/thirdclean
M pod/perlhacktips.pod
M t/TEST
commit 499cea6bb2a524e77c3c7bbe334bac90b130b3b6
Author: Nicholas Clark <n...@ccl4.org>
Date: Wed Jun 19 12:35:33 2013 +0200
Remove various rarely used test targets from the generated Makefile.
Remove these targets and their documentation:
check.third check.utf16 check.utf8 coretest minitest.utf16 test.deparse
test.taintwarn test.third test.torture test.utf16 test.utf8
test_notty.deparse test_notty.third test_prep.third torturetest ucheck
ucheck.third ucheck.utf16 ucheck.valgrind utest utest.third utest.utf16
utest.valgrind
It's still possible to run the actions these targets "by hand", if desired.
This commit simply removes the convenience targets from the Makefile,
reducing its complexity.
M Makefile.SH
M pod/perlhack.pod
-----------------------------------------------------------------------
Summary of changes:
MANIFEST | 2 -
Makefile.SH | 159 ++---------------------------
Porting/README.pod | 9 --
Porting/pumpkin.pod | 36 -------
Porting/testall.atom | 91 -----------------
Porting/thirdclean | 91 -----------------
pod/perldelta.pod | 18 +++-
pod/perlhack.pod | 45 +--------
pod/perlhacktips.pod | 275 +++++++++++++--------------------------------------
runtests.SH | 9 +-
t/TEST | 23 -----
t/op/magic.t | 2 +-
t/run/runenv.t | 2 +-
t/win32/runenv.t | 2 +-
14 files changed, 97 insertions(+), 667 deletions(-)
delete mode 100644 Porting/testall.atom
delete mode 100644 Porting/thirdclean
diff --git a/MANIFEST b/MANIFEST
index 19d55e5..001108d 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -4692,8 +4692,6 @@ Porting/release_schedule.pod Schedule for future
releases
Porting/rt_list_patches A tool to help you apply patches from RT
Porting/sort_perldiag.pl Keep our diagnostics orderly
Porting/sync-with-cpan Sync with CPAN
-Porting/testall.atom Cumulative profile with Third Degree
-Porting/thirdclean Cleanup Third Degree reports
Porting/timecheck2.c Test program for the 2038 fix
Porting/timecheck.c Test program for the 2038 fix
Porting/todo.pod Perl things to do
diff --git a/Makefile.SH b/Makefile.SH
index 715fc61..83293cb 100755
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -915,18 +915,7 @@ lib/buildcustomize.pl: $& $(mini_obj)
write_buildcustomize.pl
$(PERL_EXE): $& perlmain$(OBJ_EXT) $(LIBPERL) $(static_ext) ext.libs
$(PERLEXPORT) write_buildcustomize.pl
-@rm -f miniperl.xok
- $(SHRPENV) $(LDLIBPTH) $(CC) -o perl$(PERL_SUFFIX)
$(PERL_PROFILE_LDFLAGS) $(CLDFLAGS) $(CCDLFLAGS) perlmain$(OBJ_EXT)
$(static_ext) $(LLIBPERL) `cat ext.libs` $(libs)
-
-# Purify/Quantify Perls.
-
-pure$(PERL_EXE): $& perlmain$(OBJ_EXT) $(LIBPERL) $(static_ext) ext.libs
$(PERLEXPORT)
- $(SHRPENV) $(LDLIBPTH) purify $(CC) -o pureperl $(CLDFLAGS)
$(CCDLFLAGS) perlmain$(OBJ_EXT) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs)
-
-purecov$(PERL_EXE): $& perlmain$(OBJ_EXT) $(LIBPERL) $(static_ext) ext.libs
$(PERLEXPORT)
- $(SHRPENV) $(LDLIBPTH) purecov $(CC) -o purecovperl $(CLDFLAGS)
$(CCDLFLAGS) perlmain$(OBJ_EXT) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs)
-
-quant$(PERL_EXE): $& perlmain$(OBJ_EXT) $(LIBPERL) $(static_ext) ext.libs
$(PERLEXPORT)
- $(SHRPENV) $(LDLIBPTH) quantify $(CC) -o quantperl $(CLDFLAGS)
$(CCDLFLAGS) perlmain$(OBJ_EXT) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs)
+ $(SHRPENV) $(LDLIBPTH) $(CC) -o perl $(CLDFLAGS) $(CCDLFLAGS)
perlmain$(OBJ_EXT) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs)
!NO!SUBS!
@@ -936,8 +925,6 @@ linux*|darwin*)
# Valgrind perl (currently Linux, Darwin only)
perl.valgrind.config: config.sh
- @echo "To build perl.valgrind you must Configure -Doptimize=-g
-Uusemymalloc, checking..."
- @$(MAKE) perl.config.dashg
@echo "Checking usemymalloc='n' in config.sh..."
@grep "^usemymalloc=" config.sh
@grep "^usemymalloc='n'" config.sh >/dev/null || exit 1
@@ -949,77 +936,6 @@ esac
$spitshell >>$Makefile <<'!NO!SUBS!'
-# Third Degree Perl (Tru64 only)
-
-perl.config.dashg:
- @echo "Checking optimize='-g' in config.sh..."
- @grep "^optimize=" config.sh
- @egrep "^optimize='(.*-g.*)'" config.sh >/dev/null || exit 1
-
-perl.third.config: config.sh
- @echo "To build perl.third you must Configure -Doptimize=-g
-Uusemymalloc, checking..."
- @$(MAKE) perl.config.dashg
- @echo "Checking usemymalloc='n' in config.sh..."
- @grep "^usemymalloc=" config.sh
- @grep "^usemymalloc='n'" config.sh >/dev/null || exit 1
-
-perl.third: /usr/bin/atom perl.third.config perl
- atom -tool third -L. -all -gp -toolargs="-invalid -uninit
heap+stack+copy -min 0" perl
- @echo "Now you may run perl.third and then study perl.3log."
-
-# Pixie Perls (Tru64 and IRIX only)
-
-perl.pixie.config: config.sh
- @echo "To build perl.pixie you must Configure -Doptimize=-g,
checking..."
- @$(MAKE) perl.config.dashg
-
-perl.pixie.atom: /usr/bin/atom perl
- atom -tool pixie -L. -all -toolargs="-quiet" perl
-
-perl.pixie.irix: perl
- pixie perl
-
-perl.pixie: /usr/bin/pixie perl.pixie.config perl
- if test -x /usr/bin/atom; then \
- $(MAKE) perl.pixie.atom; \
- else \
- $(MAKE) perl.pixie.irix; \
- fi
- @echo "Now you may run perl.pixie and then run pixie."
-
-# Gprof Perl
-
-perl.config.dashpg:
- @echo "Checking optimize='-pg' in config.sh..."
- @grep "^optimize=" config.sh
- @grep "^optimize='.*-pg.*'" config.sh >/dev/null || exit 1
-
-perl.gprof.config: config.sh
- @echo "To build perl.gprof you must Configure -Doptimize=-pg,
checking..."
- @$(MAKE) perl.config.dashpg
-
-perl.gprof: /usr/bin/gprof perl.gprof.config
- @-rm -f perl
- $(MAKE) PERL_SUFFIX=.gprof PERL_PROFILE_LDFLAGS=-pg perl
- @echo "Now you may run perl.gprof and then run gprof perl.gprof."
-
-# Gcov Perl
-
-perl.config.gcov:
- @echo "To build perl.gcov you must use gcc 3.0 or newer, checking..."
- @echo "Checking gccversion in config.sh..."
- @grep "^gccversion=" config.sh
- @grep "^gccversion='[3-9]\." config.sh >/dev/null || exit 1
- @echo "To build perl.gcov you must Configure -Dccflags=-fprofile-arcs
-ftest-coverage, checking..."
- @echo "Checking ccflags='-fprofile-arcs -ftest-coverage' in
config.sh..."
- @grep "^ccflags=" config.sh
- @grep "^ccflags='.*-fprofile-arcs -ftest-coverage.*'" config.sh
>/dev/null || exit 1
-
-perl.gcov: perl.config.gcov
- @-rm -f perl
- $(MAKE) PERL_SUFFIX=.gcov PERL_PROFILE_LDFLAGS='' perl
- @echo "Now you may run perl.gcov and then run gcov some.c."
-
# Microperl. This is just a convenience thing if one happens to
# build also the full Perl and therefore the real big Makefile:
# usually one should manually explicitly issue the below command.
@@ -1294,9 +1210,7 @@ _mopup:
-@test -f vms/README_vms.pod && rm -f vms/README_vms.pod
-rm -f perl.exp ext.libs $(generated_pods) uni.data opmini.o perlmini.o
pod/roffitall
-rm -f perl.export perl.dll perl.libexp perl.map perl.def
- -rm -f perl.third lib*.so.perl.third perl.3log t/perl.third t/perl.3log
- -rm -f perl.pixie lib*.so.perl.pixie lib*.so.Addrs
- -rm -f perl.Addrs perl.Counts t/perl.Addrs t/perl.Counts *perl.xok
+ -rm -f *perl.xok
-rm -f cygwin.c libperl*.def libperl*.dll cygperl*.dll *.exe.stackdump
-rm -f $(PERL_EXE) $(MINIPERL_EXE) $(LIBPERL) libperl.* microperl
-rm -f config.arch config.over $(DTRACE_H)
@@ -1430,15 +1344,11 @@ depend: makedepend
.PHONY: test check test_prep test_prep_nodll test_prep_pre \
test_prep_reonly test_tty test-tty test_notty test-notty \
- utest ucheck test.utf8 check.utf8 test.torture torturetest \
- test.utf16 check.utf16 utest.utf16 ucheck.utf16 \
- test.third check.third utest.third ucheck.third test_notty.third \
- test.deparse test_notty.deparse test_harness test_harness_notty \
- minitest coretest test.taintwarn test-reonly _test
+ test_harness test_harness_notty minitest test-reonly _test
_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
@@ -1465,29 +1375,6 @@ test_tty test-tty: test_prep
test_notty test-notty: test_prep
$(RUN_TESTS) no-tty
-utest ucheck test.utf8 check.utf8: test_prep
- TEST_ARGS=-utf8 $(RUN_TESTS) choose
-
-coretest: test_prep
- TEST_ARGS=-core $(RUN_TESTS) choose
-
-# Torture testing
-
-test.torture torturetest: test_prep
- TEST_ARGS=-torture $(RUN_TESTS) choose
-
-# Targets for UTF16 testing:
-
-minitest.utf16: minitest.prep
- - cd t && (rm -f $(PERL_EXE); $(LNS) ../$(MINIPERL_EXE) $(PERL_EXE)) \
- && $(RUN_PERL) TEST -utf16 base/*.t comp/*.t cmd/*.t run/*.t
io/*.t opbasic/*.t op/*.t uni/*.t </dev/tty
-
-test.utf16 check.utf16: test_prep
- TEST_ARGS=-utf16 $(RUN_TESTS) choose
-
-utest.utf16 ucheck.utf16: test_prep
- TEST_ARGS="-utf8 -utf16" $(RUN_TESTS) choose
-
!NO!SUBS!
case "${osname}${osvers}" in
@@ -1500,9 +1387,6 @@ test_prep.valgrind: test_prep perl.valgrind
test.valgrind check.valgrind: test_prep perl.valgrind.config
PERL_VALGRIND=1 VALGRIND='$(VALGRIND)' $(RUN_TESTS) choose
-utest.valgrind ucheck.valgrind: test_prep.valgrind perl.valgrind.config
- PERL_VALGRIND=1 TEST_ARGS=-utf8 $(RUN_TESTS) choose
-
test_notty.valgrind: test_prep.valgrind perl.valgrind.config
PERL_VALGRIND=1 $(RUN_TESTS) no-tty
!NO!SUBS!
@@ -1511,43 +1395,14 @@ esac
$spitshell >>$Makefile <<'!NO!SUBS!'
-# Targets for Third Degree testing.
-
-test_prep.third: test_prep perl.third
- cd t && (rm -f ./perl.third$(EXE_EXT); $(LNS) ../perl.third$(EXE_EXT)
perl.third(EXE_EXT))
-
-test.third check.third: test_prep.third perl.third
- PERL=./perl.third PERL_3LOG=1 $(RUN_TESTS) choose
-
-utest.third ucheck.third: test_prep.third perl.third
- PERL=./perl.third PERL_3LOG=1 TEST_ARGS=-utf8 $(RUN_TESTS) choose
-
-test_notty.third: test_prep.third perl.third
- PERL=./perl.third PERL_3LOG=1 $(RUN_TESTS) choose
-
-# Targets for Deparse testing.
-
-test.deparse: test_prep
- TEST_ARGS=-deparse $(RUN_TESTS) choose
-
-test_notty.deparse: test_prep
- TEST_ARGS=-deparse $(RUN_TESTS) no-tty
-
-# Targets to run the test suite with -t
-
-test.taintwarn: test_prep
- TEST_ARGS=-taintwarn $(RUN_TESTS) choose
-
-minitest.prep:
+# Can't depend on lib/Config.pm because that might be where miniperl
+# is crashing.
+minitest: $(MINIPERL_EXE)
-@test -f lib/Config.pm || $(MAKE) lib/Config.pm $(unidatafiles)
@echo " "
@echo "You may see some irrelevant test failures if you have been
unable"
@echo "to build lib/Config.pm, or the Unicode data files."
@echo " "
-
-# Can't depend on lib/Config.pm because that might be where miniperl
-# is crashing.
-minitest: $(MINIPERL_EXE) minitest.prep
- cd t && (rm -f $(PERL_EXE); $(LNS) ../$(MINIPERL_EXE) $(PERL_EXE)) \
&& $(RUN_PERL) TEST base/*.t comp/*.t cmd/*.t run/*.t io/*.t
re/*.t opbasic/*.t op/*.t uni/*.t </dev/tty
diff --git a/Porting/README.pod b/Porting/README.pod
index e77c80d..2bd612d 100644
--- a/Porting/README.pod
+++ b/Porting/README.pod
@@ -323,15 +323,6 @@ and case are ignored, as explained in L<perldiag>.
Script to help out with syncing cpan distros.
-=head2 F<testall.atom>
-
-Test suite profiling on Tru 64.
-
-=head2 F<thirdclean>
-
-Script for cleaning out the "known noise" from Third Degree reports: either
-noise caused by F<libc> itself, or F<Perl_yyparse> leaks.
-
=head2 F<timecheck2.c>
A little program to test the limits of your system's time functions. See
diff --git a/Porting/pumpkin.pod b/Porting/pumpkin.pod
index 89c5a46..a8c8fb0 100644
--- a/Porting/pumpkin.pod
+++ b/Porting/pumpkin.pod
@@ -651,42 +651,6 @@ things.
=back
-=head1 Running Purify
-
-Purify is a commercial tool that is helpful in identifying memory
-overruns, wild pointers, memory leaks and other such badness. Perl
-must be compiled in a specific way for optimal testing with Purify.
-
-Use the following commands to test perl with Purify:
-
- sh Configure -des -Doptimize=-g -Uusemymalloc \
- -Dusemultiplicity -Accflags=-DPURIFY
- setenv PURIFYOPTIONS "-chain-length=25"
- make all pureperl
- cd t
- ln -s ../pureperl perl
- setenv PERL_DESTRUCT_LEVEL 2
- ./perl TEST
-
-Disabling Perl's malloc allows Purify to monitor allocations and leaks
-more closely; using Perl's malloc will make Purify report most leaks
-in the "potential" leaks category. Enabling the multiplicity option
-allows perl to clean up thoroughly when the interpreter shuts down, which
-reduces the number of bogus leak reports from Purify. The -DPURIFY
-enables any Purify-specific debugging code in the sources.
-
-Purify outputs messages in "Viewer" windows by default. If you don't have
-a windowing environment or if you simply want the Purify output to
-unobtrusively go to a log file instead of to the interactive window,
-use the following options instead:
-
- setenv PURIFYOPTIONS "-chain-length=25 -windows=no \
- -log-file=perl.log -append-logfile=yes"
-
-The only currently known leaks happen when there are compile-time errors
-within eval or require. (Fixing these is non-trivial, unfortunately, but
-they must be fixed eventually.)
-
=head1 Common Gotchas
=over 4
diff --git a/Porting/testall.atom b/Porting/testall.atom
deleted file mode 100644
index 8796f08..0000000
--- a/Porting/testall.atom
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/sh
-
-#
-# testall.atom - test suite profiling on Tru 64
-#
-# This script creates all.Counts file that can be fed to prof(1)
-# to produce various basic block counting profiles.
-#
-# This script needs to be run at the top level of the Perl build
-# directory after the "make all" and "make test" targets have been run.
-#
-# You will also need to have perl.pixie built,
-# which means that you will also have Configured with -Doptimize=-g.
-#
-# After the script has been run (this will take several minutes)
-# you will have a file called all.Counts, which contains the cumulative
-# basic block counting results over the whole Perl test suite.
-# You can produce various reports using prof(1);
-#
-# prof -pixie -all -L. perl all.Counts
-# prof -pixie -heavy -all -L. perl all.Counts
-# prof -pixie -invocations -all -L. perl all.Counts
-# prof -pixie -lines -all -L. perl all.Counts
-# prof -pixie -testcoverage -all -L. perl all.Counts
-# prof -pixie -zero -all -L. perl all.Counts
-#
-# io/openpid and op/fork core on me, I don't know why and haven't
-# taken a look yet.
-#
-# j...@iki.fi
-#
-
-if test ! -f /usr/bin/atom
-then
- echo "$0: no /usr/bin/atom"
- exit 1
-fi
-
-if test ! -f perl; then echo "$0: no perl"; exit 1; fi
-if test ! -f perl.pixie; then echo "$0: no perl.pixie; exit 1; fi
-if test ! -f t/perl; then echo "$0: no t/perl; exit 1; fi
-
-LD_LIBRARY_PATH=`pwd`
-export LD_LIBRARY_PATH
-
-cd t || exit 1
-
-ln -sf ../perl.pixie .
-
-if test $# = 0; then
- the_t=`echo base/*.t comp/*.t cmd/*.t run/*.t io/*.t; echo op/*.t uni/*.t
pod/*.t x2p/*.t; find ../ext ../lib -name '*.t' -print`
-else
- the_t=$@
-fi
-
-PERL_DESTRUCT_LEVEL=2
-export PERL_DESTRUCT_LEVEL
-PERL_CORE=1
-export PERL_CORE
-
-rm -f all.Counts
-
-for t in $the_t
-do
- case "$t" in
- ext/*|lib/*) t=../$t ;;
- t/*) t=`echo $t|sed 's:^t/::'` ;;
- esac
- echo $t|sed 's:\.t$::'
- sw=''
- case "`head -1 $t|egrep -e '^#.* -.*T'`" in
- *-*T*) sw="$sw -T" ;;
- esac
- case "`head -1 $t|egrep -e '^#.* -.*t'`" in
- *-*t*) sw="$sw -t" ;;
- esac
- ./perl.pixie -I../lib $sw $t > /dev/null
- if cd ..
- then
- if test -f all.Counts
- then
- prof -pixie -merge new.Counts -L. -incobj libperl.so perl
t/perl.Counts all.Counts
- mv new.Counts all.Counts
- else
- mv t/perl.Counts all.Counts
- fi
- cd t
- fi
-done
-
-exit 0
diff --git a/Porting/thirdclean b/Porting/thirdclean
deleted file mode 100644
index 8f1d3f8..0000000
--- a/Porting/thirdclean
+++ /dev/null
@@ -1,91 +0,0 @@
-#!./perl
-
-# DAPM: this description is from the original commit message:
-# this appears to be a HP leak detection thing:
-#
-# Add a script for cleaning out the "known noise"
-# from Third Degree reports: either noise caused
-# by libc itself, or Perl_yyparse leaks.
-
-local $/;
-$_ = <ARGV>;
-
-my @accv = /(^-+ \w+ -- \d+ --(?:.(?!^-))+)/msg;
-my @leak = /(\d+ bytes? in \d+ leaks? .+? created at:(?:.(?!^[\d-]))+)/msg;
-
-$leak[ 0] =~ s/.* were found:\n\n//m; # Snip off totals.
-
-# Weed out the known access violations.
-
-@accv = grep { ! /-- ru[hs] --.+setlocale.+Perl_init_i18nl10n/s } @accv;
-@accv = grep { ! /-- [rw][ui]s --.+_doprnt_dis/s } @accv;
-@accv = grep { ! /-- (?:fon|ris) --.+__strxfrm/s } @accv;
-@accv = grep { ! /-- rus --.+__catgets/s } @accv;
-@accv = grep { ! /-- rus --.+__execvp/s } @accv;
-@accv = grep { ! /-- rus --.+tmpnam.+tmpfile/s } @accv;
-@accv = grep { ! /-- rus --.+__gethostbyname/s } @accv;
-@accv = grep { ! /-- ris --.+__actual_atof/s } @accv;
-@accv = grep { ! /-- ris --.+__strftime/s } @accv;
-
-# Weed out untraceable access violations.
-@accv = grep { ! / ----- /s } @accv;
-@accv = grep { ! /-- r[ui][hs] --.+proc_at_/s } @accv;
-@accv = grep { ! /-- r[ui][hs] --.+pc = 0x/s } @accv;
-
-# The following look like being caused by the intrinsic inlined
-# string handling functions reading one or few bytes beyond the
-# actual length.
-@accv = grep { ! /-- rih --.+(?:memmove|strcpy).+moreswitches/s } @accv;
-@accv = grep { ! /-- (?:rih|rus) --.+strcpy.+gv_fetchfile/s } @accv;
-@accv = grep { ! /-- rih --.+strcmp.+doopen_pm/s } @accv;
-@accv = grep { ! /-- rih --.+strcmp.+gv_fetchpv/s } @accv;
-@accv = grep { ! /-- r[ui]h --.+strcmp.+gv_fetchmeth/s } @accv;
-@accv = grep { ! /-- rih --.+memmove.+my_setenv/s } @accv;
-@accv = grep { ! /-- rih --.+memmove.+catpvn_flags/s } @accv;
-
-# yyparse.
-@accv = grep { ! /Perl_yyparse/s } @accv;
-
-# Weed out the known memory leaks.
-
-@leak = grep { ! /setlocale.+Perl_init_i18nl10n/s } @leak;
-@leak = grep { ! /setlocale.+set_numeric_standard/s } @leak;
-@leak = grep { ! /_findiop.+fopen/s } @leak;
-@leak = grep { ! /_findiop.+__fdopen/s } @leak;
-@leak = grep { ! /__localtime/s } @leak;
-@leak = grep { ! /__get_libc_context/s } @leak;
-@leak = grep { ! /__sia_init/s } @leak;
-
-# Weed out untraceable memory leaks.
-@leak = grep { ! / ----- /s } @leak;
-@leak = grep { ! /pc = 0x/s } @leak;
-@leak = grep { ! /_pc_range_table/s } @leak;
-@leak = grep { ! /_add_gp_range/s } @leak;
-
-# yyparse.
-@leak = grep { ! /Perl_yyparse/s } @leak;
-
-# Output the cleaned up report.
-
-# Access violations.
-
-for (my $i = 0; $i < @accv; $i++) {
- $_ = $accv[$i];
- s/\d+/$i/;
- print;
-}
-
-# Memory leaks.
-
-my ($leakb, $leakn, $leaks);
-
-for (my $i = 0; $i < @leak; $i++) {
- $_ = $leak[$i];
- print $_, "\n";
- /^(\d+) bytes? in (\d+) leak/;
- $leakb += $1;
- $leakn += $2;
- $leaks += $1 if /including (\d+) super/;
-}
-
-print "Bytes $leakb Leaks $leakn Super $leaks\n" if $leakb;
diff --git a/pod/perldelta.pod b/pod/perldelta.pod
index fa53a2f..c9a5eb2 100644
--- a/pod/perldelta.pod
+++ b/pod/perldelta.pod
@@ -324,7 +324,23 @@ well.
=item *
-XXX
+The Makefile shortcut targets for many rarely (or never) used testing and
+profiling targets have been removed, or merged into the only other Makefile
+target that uses them. Specifically, these targets are gone, along with
+documentation that referenced them or explained how to use them:
+
+ check.third check.utf16 check.utf8 coretest minitest.prep
+ minitest.utf16 perl.config.dashg perl.config.dashpg
+ perl.config.gcov perl.gcov perl.gprof perl.gprof.config perl.pixie
+ perl.pixie.atom perl.pixie.config perl.pixie.irix perl.third
+ perl.third.config pureperl purecovperl quantperl test.deparse
+ test.taintwarn test.third test.torture test.utf16 test.utf8
+ test_notty.deparse test_notty.third test_prep.third torturetest
+ ucheck ucheck.third ucheck.utf16 ucheck.valgrind utest utest.third
+ utest.utf16 utest.valgrind
+
+It's still possible to run the relevant commands by "hand" - no underlying
+functionality has been removed.
=back
diff --git a/pod/perlhack.pod b/pod/perlhack.pod
index 6984bcb..22bb8b6 100644
--- a/pod/perlhack.pod
+++ b/pod/perlhack.pod
@@ -765,60 +765,17 @@ systems.
This runs some basic sanity tests on the source tree and helps catch
basic errors before you submit a patch.
-=item * coretest
-
-Run F<perl> on all core tests (F<t/*> and F<lib/[a-z]*> pragma tests).
-
-(Not available on Win32)
-
-=item * test.deparse
-
-Run all the tests through L<B::Deparse>. Not all tests will succeed.
-
-(Not available on Win32)
-
-=item * test.taintwarn
-
-Run all tests with the B<-t> command-line switch. Not all tests are
-expected to succeed (until they're specifically fixed, of course).
-
-(Not available on Win32)
-
=item * minitest
Run F<miniperl> on F<t/base>, F<t/comp>, F<t/cmd>, F<t/run>, F<t/io>,
F<t/op>, F<t/uni> and F<t/mro> tests.
-=item * test.valgrind check.valgrind utest.valgrind ucheck.valgrind
+=item * test.valgrind check.valgrind
(Only in Linux) Run all the tests using the memory leak + naughty
memory access tool "valgrind". The log files will be named
F<testname.valgrind>.
-=item * test.torture torturetest
-
-Run all the usual tests and some extra tests. As of Perl 5.8.0, the
-only extra tests are Abigail's JAPHs, F<t/japh/abigail.t>.
-
-You can also run the torture test with F<t/harness> by giving
-C<-torture> argument to F<t/harness>.
-
-=item * utest ucheck test.utf8 check.utf8
-
-Run all the tests with -Mutf8. Not all tests will succeed.
-
-(Not available on Win32)
-
-=item * minitest.utf16 test.utf16
-
-Runs the tests with UTF-16 encoded scripts, encoded with different
-versions of this encoding.
-
-C<make utest.utf16> runs the test suite with a combination of C<-utf8>
-and C<-utf16> arguments to F<t/TEST>.
-
-(Not available on Win32)
-
=item * test_harness
Run the test suite with the F<t/harness> controlling program, instead
diff --git a/pod/perlhacktips.pod b/pod/perlhacktips.pod
index 324ed1a..7851db9 100644
--- a/pod/perlhacktips.pod
+++ b/pod/perlhacktips.pod
@@ -979,18 +979,7 @@ factor 2.
B<NOTE 2>: To minimize the number of memory leak false alarms (see
L</PERL_DESTRUCT_LEVEL> for more information), you have to set the
-environment variable PERL_DESTRUCT_LEVEL to 2.
-
-For csh-like shells:
-
- setenv PERL_DESTRUCT_LEVEL 2
-
-For Bourne-type shells:
-
- PERL_DESTRUCT_LEVEL=2
- export PERL_DESTRUCT_LEVEL
-
-In Unixy environments you can also use the C<env> command:
+environment variable PERL_DESTRUCT_LEVEL to 2. For example, like this:
env PERL_DESTRUCT_LEVEL=2 valgrind ./perl -Ilib ...
@@ -1003,139 +992,6 @@ B<NOTE 4>: L<DynaLoader> will not clean up after itself
completely
unless Perl is built with the Configure option
C<-Accflags=-DDL_UNLOAD_ALL_AT_EXIT>.
-=head2 Rational Software's Purify
-
-Purify is a commercial tool that is helpful in identifying memory
-overruns, wild pointers, memory leaks and other such badness. Perl must
-be compiled in a specific way for optimal testing with Purify. Purify
-is available under Windows NT, Solaris, HP-UX, SGI, and Siemens Unix.
-
-=head3 Purify on Unix
-
-On Unix, Purify creates a new Perl binary. To get the most benefit out
-of Purify, you should create the perl to Purify using:
-
- sh Configure -Accflags=-DPURIFY -Doptimize='-g' \
- -Uusemymalloc -Dusemultiplicity
-
-where these arguments mean:
-
-=over 4
-
-=item * -Accflags=-DPURIFY
-
-Disables Perl's arena memory allocation functions, as well as forcing
-use of memory allocation functions derived from the system malloc.
-
-=item * -Doptimize='-g'
-
-Adds debugging information so that you see the exact source statements
-where the problem occurs. Without this flag, all you will see is the
-source filename of where the error occurred.
-
-=item * -Uusemymalloc
-
-Disable Perl's malloc so that Purify can more closely monitor
-allocations and leaks. Using Perl's malloc will make Purify report most
-leaks in the "potential" leaks category.
-
-=item * -Dusemultiplicity
-
-Enabling the multiplicity option allows perl to clean up thoroughly
-when the interpreter shuts down, which reduces the number of bogus leak
-reports from Purify.
-
-=back
-
-Once you've compiled a perl suitable for Purify'ing, then you can just:
-
- make pureperl
-
-which creates a binary named 'pureperl' that has been Purify'ed. This
-binary is used in place of the standard 'perl' binary when you want to
-debug Perl memory problems.
-
-As an example, to show any memory leaks produced during the standard
-Perl testset you would create and run the Purify'ed perl as:
-
- make pureperl
- cd t
- ../pureperl -I../lib harness
-
-which would run Perl on test.pl and report any memory problems.
-
-Purify outputs messages in "Viewer" windows by default. If you don't
-have a windowing environment or if you simply want the Purify output to
-unobtrusively go to a log file instead of to the interactive window,
-use these following options to output to the log file "perl.log":
-
- setenv PURIFYOPTIONS "-chain-length=25 -windows=no \
- -log-file=perl.log -append-logfile=yes"
-
-If you plan to use the "Viewer" windows, then you only need this
-option:
-
- setenv PURIFYOPTIONS "-chain-length=25"
-
-In Bourne-type shells:
-
- PURIFYOPTIONS="..."
- export PURIFYOPTIONS
-
-or if you have the "env" utility:
-
- env PURIFYOPTIONS="..." ../pureperl ...
-
-=head3 Purify on NT
-
-Purify on Windows NT instruments the Perl binary 'perl.exe' on the fly.
- There are several options in the makefile you should change to get the
-most use out of Purify:
-
-=over 4
-
-=item * DEFINES
-
-You should add -DPURIFY to the DEFINES line so the DEFINES line looks
-something like:
-
- DEFINES = -DWIN32 -D_CONSOLE -DNO_STRICT $(CRYPT_FLAG) -DPURIFY=1
-
-to disable Perl's arena memory allocation functions, as well as to
-force use of memory allocation functions derived from the system
-malloc.
-
-=item * USE_MULTI = define
-
-Enabling the multiplicity option allows perl to clean up thoroughly
-when the interpreter shuts down, which reduces the number of bogus leak
-reports from Purify.
-
-=item * #PERL_MALLOC = define
-
-Disable Perl's malloc so that Purify can more closely monitor
-allocations and leaks. Using Perl's malloc will make Purify report most
-leaks in the "potential" leaks category.
-
-=item * CFG = Debug
-
-Adds debugging information so that you see the exact source statements
-where the problem occurs. Without this flag, all you will see is the
-source filename of where the error occurred.
-
-=back
-
-As an example, to show any memory leaks produced during the standard
-Perl testset you would create and run Purify as:
-
- cd win32
- make
- cd ../t
- purify ../perl -I../lib harness
-
-which would instrument Perl in memory, run Perl on test.pl, then
-finally report any memory problems.
-
=head2 valgrind
The valgrind tool can be used to find out both memory leaks and illegal
@@ -1160,12 +1016,12 @@ To get valgrind and for more information see
=head2 AddressSanitizer
-AddressSanitizer is a clang extension, included in clang since v3.1. It
-checks illegal heap pointers, global pointers, stack pointers and use
-after free errors, and is fast enough that you can easily compile your
-debugging or optimized perl with it. It does not check memory leaks
-though. AddressSanitizer is available for linux, Mac OS X and soon on
-Windows.
+AddressSanitizer is a clang and gcc extension, included in clang since
+v3.1 and gcc since v4.8. It checks illegal heap pointers, global
+pointers, stack pointers and use after free errors, and is fast enough
+that you can easily compile your debugging or optimized perl with it.
+It does not check memory leaks though. AddressSanitizer is available
+for Linux, Mac OS X and soon on Windows.
To build perl with AddressSanitizer, your Configure invocation should
look like:
@@ -1196,7 +1052,7 @@ Link the perl executable with AddressSanitizer.
Link dynamic extensions with AddressSanitizer. You must manually
specify C<-shared> because using C<-Alddlflags=-shared> will prevent
Configure from setting a default value for C<lddlflags>, which usually
-contains C<-shared> (at least on linux).
+contains C<-shared> (at least on Linux).
=back
@@ -1236,18 +1092,27 @@ results.
=head2 Gprof Profiling
-gprof is a profiling tool available in many Unix platforms, it uses
-F<statistical time-sampling>.
+I<gprof> is a profiling tool available in many Unix platforms which
+uses I<statistical time-sampling>. You can build a profiled version of
+F<perl> by compiling using gcc with the flag C<-pg>. Either edit
+F<config.sh> or re-run F<Configure>. Running the profiled version of
+Perl will create an output file called F<gmon.out> which contains the
+profiling data collected during the execution.
+
+quick hint:
+
+ $ sh Configure -des -Dusedevel -Accflags='-pg' \
+ -Aldflags='-pg' -Alddlflags='-pg -shared' \
+ && make perl
+ $ ./perl ... # creates gmon.out in current directory
+ $ gprof ./perl > out
+ $ less out
-You can build a profiled version of perl called "perl.gprof" by
-invoking the make target "perl.gprof" (What is required is that Perl
-must be compiled using the C<-pg> flag, you may need to re-Configure).
-Running the profiled version of Perl will create an output file called
-F<gmon.out> is created which contains the profiling data collected
-during the execution.
+(you probably need to add C<-shared> to the <-Alddlflags> line until RT
+#118199 is resolved)
-The gprof tool can then display the collected data in various ways.
-Usually gprof understands the following options:
+The F<gprof> tool can then display the collected data in various ways.
+Usually F<gprof> understands the following options:
=over 4
@@ -1279,30 +1144,35 @@ Display routines that have zero usage.
=back
For more detailed explanation of the available commands and output
-formats, see your own local documentation of gprof.
+formats, see your own local documentation of F<gprof>.
-quick hint:
+=head2 GCC gcov Profiling
- $ sh Configure -des -Dusedevel -Doptimize='-pg' && make perl.gprof
- $ ./perl.gprof someprog # creates gmon.out in current directory
- $ gprof ./perl.gprof > out
- $ view out
+I<basic block profiling> is officially available in gcc 3.0 and later.
+You can build a profiled version of F<perl> by compiling using gcc with
+the flags C<-fprofile-arcs -ftest-coverage>. Either edit F<config.sh>
+or re-run F<Configure>.
-=head2 GCC gcov Profiling
+quick hint:
-Starting from GCC 3.0 I<basic block profiling> is officially available
-for the GNU CC.
+ $ sh Configure -des -Dusedevel -Doptimize='-g' \
+ -Accflags='-fprofile-arcs -ftest-coverage' \
+ -Aldflags='-fprofile-arcs -ftest-coverage' \
+ -Alddlflags='-fprofile-arcs -ftest-coverage -shared' \
+ && make perl
+ $ rm -f regexec.c.gcov regexec.gcda
+ $ ./perl ...
+ $ gcov regexec.c
+ $ less regexec.c.gcov
-You can build a profiled version of perl called F<perl.gcov> by
-invoking the make target "perl.gcov" (what is required that Perl must
-be compiled using gcc with the flags C<-fprofile-arcs -ftest-coverage>,
-you may need to re-Configure).
+(you probably need to add C<-shared> to the <-Alddlflags> line until RT
+#118199 is resolved)
Running the profiled version of Perl will cause profile output to be
-generated. For each source file an accompanying ".da" file will be
+generated. For each source file an accompanying F<.gcda> file will be
created.
-To display the results you use the "gcov" utility (which should be
+To display the results you use the I<gcov> utility (which should be
installed if you have gcc 3.0 or newer installed). F<gcov> is run on
source code files, like this
@@ -1310,47 +1180,36 @@ source code files, like this
which will cause F<sv.c.gcov> to be created. The F<.gcov> files contain
the source code annotated with relative frequencies of execution
-indicated by "#" markers.
+indicated by "#" markers. If you want to generate F<.gcov> files for
+all profiled object files, you can run something like this:
+
+ for file in `find . -name \*.gcno`
+ do sh -c "cd `dirname $file` && gcov `basename $file .gcno`"
+ done
Useful options of F<gcov> include C<-b> which will summarise the basic
block, branch, and function call coverage, and C<-c> which instead of
relative frequencies will use the actual counts. For more information
on the use of F<gcov> and basic block profiling with gcc, see the
-latest GNU CC manual, as of GCC 3.0 see
-
- http://gcc.gnu.org/onlinedocs/gcc-3.0/gcc.html
-
-and its section titled "8. gcov: a Test Coverage Program"
-
- http://gcc.gnu.org/onlinedocs/gcc-3.0/gcc_8.html#SEC132
-
-quick hint:
-
- $ sh Configure -des -Dusedevel -Doptimize='-g' \
- -Accflags='-fprofile-arcs -ftest-coverage' \
- -Aldflags='-fprofile-arcs -ftest-coverage' && make perl.gcov
- $ rm -f regexec.c.gcov regexec.gcda
- $ ./perl.gcov
- $ gcov regexec.c
- $ view regexec.c.gcov
+latest GNU CC manual. As of gcc 4.8, this is at
+L<http://gcc.gnu.org/onlinedocs/gcc/Gcov-Intro.html#Gcov-Intro>
=head1 MISCELLANEOUS TRICKS
=head2 PERL_DESTRUCT_LEVEL
If you want to run any of the tests yourself manually using e.g.
-valgrind, or the pureperl or perl.third executables, please note that
-by default perl B<does not> explicitly cleanup all the memory it has
-allocated (such as global memory arenas) but instead lets the exit() of
-the whole program "take care" of such allocations, also known as
-"global destruction of objects".
+valgrind, please note that by default perl B<does not> explicitly
+cleanup all the memory it has allocated (such as global memory arenas)
+but instead lets the exit() of the whole program "take care" of such
+allocations, also known as "global destruction of objects".
There is a way to tell perl to do complete cleanup: set the environment
variable PERL_DESTRUCT_LEVEL to a non-zero value. The t/TEST wrapper
does set this to 2, and this is what you need to do too, if you don't
-want to see the "global leaks": For example, for "third-degreed" Perl:
+want to see the "global leaks": For example, for running under valgrind
- env PERL_DESTRUCT_LEVEL=2 ./perl.third -Ilib t/foo/bar.t
+ env PERL_DESTRUCT_LEVEL=2 valgrind ./perl -Ilib t/foo/bar.t
(Note: the mod_perl apache module uses also this environment variable
for its own purposes and extended its semantics. Refer to the mod_perl
@@ -1459,16 +1318,16 @@ L<perlclib>.
Under ithreads the optree is read only. If you want to enforce this, to
check for write accesses from buggy code, compile with
C<-DPERL_DEBUG_READONLY_OPS> to enable code that allocates op memory
-via C<mmap>, and sets it read-only when it is attached to a subroutine. Any
-write access to an op results in a C<SIGBUS> and abort.
+via C<mmap>, and sets it read-only when it is attached to a subroutine.
+Any write access to an op results in a C<SIGBUS> and abort.
This code is intended for development only, and may not be portable
even to all Unix variants. Also, it is an 80% solution, in that it
-isn't able to make all ops read only. Specifically it does not apply to op
-slabs belonging to C<BEGIN> blocks.
+isn't able to make all ops read only. Specifically it does not apply to
+op slabs belonging to C<BEGIN> blocks.
-However, as an 80% solution it is still effective, as it has caught bugs in
-the past.
+However, as an 80% solution it is still effective, as it has caught
+bugs in the past.
=head2 The .i Targets
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/TEST b/t/TEST
index 3c00b5e..96eb6a4 100755
--- a/t/TEST
+++ b/t/TEST
@@ -139,21 +139,6 @@ if (-f 'TEST' && -f 'harness' && -d '../lib') {
die "You need to run \"make test\" first to set things up.\n"
unless -e 'perl' or -e 'perl.exe' or -e 'perl.pm';
-if ($ENV{PERL_3LOG}) { # Tru64 third(1) tool, see perlhack
- unless (-x 'perl.third') {
- unless (-x '../perl.third') {
- die "You need to run \"make perl.third first.\n";
- }
- else {
- print "Symlinking ../perl.third as perl.third...\n";
- die "Failed to symlink: $!\n"
- unless symlink("../perl.third", "perl.third");
- die "Symlinked but no executable perl.third: $!\n"
- unless -x 'perl.third';
- }
- }
-}
-
# check leakage for embedders
$ENV{PERL_DESTRUCT_LEVEL} = 2 unless exists $ENV{PERL_DESTRUCT_LEVEL};
# check existence of all symbols
@@ -727,14 +712,6 @@ EOT
if ($type eq 'deparse') {
unlink "./$test.dp";
}
- if ($ENV{PERL_3LOG}) {
- my $tpp = $test;
- $tpp =~ s:^\.\./::;
- $tpp =~ s:/:_:g;
- $tpp =~ s:\.t$:.3log:;
- rename("perl.3log", $tpp) ||
- die "rename: perl3.log to $tpp: $!\n";
- }
if (not defined $failure and $next != $max) {
$failure="FAILED--expected $max tests, saw $next";
}
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
