In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/9d4d67ddd2715c407b22db24e94bce467a0c7330?hp=7b6fb0b81f139d17e68673d27206294d87174a3e>
- Log ----------------------------------------------------------------- commit 9d4d67ddd2715c407b22db24e94bce467a0c7330 Author: Nicholas Clark <[email protected]> Date: Thu Jul 11 11:33:41 2013 +0200 Inline the Makefile target perl.valgrind.config into its only remaining user. Add the 3 recently deleted Makefile targets to the list in perldelta.pod, and reflow the list. M Makefile.SH M pod/perldelta.pod commit 2452b657f07d778ae6c202492869e2b79492e59a Author: Nicholas Clark <[email protected]> Date: Thu Jul 11 11:00:54 2013 +0200 Eliminate the Makefile targets test_notty.valgrind and test_prep.valgrind. The target test_notty.valgrind depends on the target test_prep.valgrind. The target test_prep.valgrind depends on the target perl.valgrind. The target perl.valgrind does not exist! perl.valgrind never existed. The targets which depend on it were added as part of commit 7a834142adbc51cc (Aug 2003), which added code and documentation for running the test suite with valgrind. However, that commit did not add a perl.valgrind target, despite adding dependencies on it. Hence the various targets which depended on it could never have worked. Of the 4 similar targets, only test.valgrind works because unlike the other 3, it depends on test_prep, not test_prep.valgrind M Makefile.SH ----------------------------------------------------------------------- Summary of changes: Makefile.SH | 31 ++++++------------------------- pod/perldelta.pod | 19 ++++++++++--------- 2 files changed, 16 insertions(+), 34 deletions(-) diff --git a/Makefile.SH b/Makefile.SH index ab0d48b..46c2620 100755 --- a/Makefile.SH +++ b/Makefile.SH @@ -914,25 +914,6 @@ $(PERL_EXE): $& perlmain$(OBJ_EXT) $(LIBPERL) $(static_ext) ext.libs $(PERLEXPOR -@rm -f miniperl.xok $(SHRPENV) $(LDLIBPTH) $(CC) -o perl $(CLDFLAGS) $(CCDLFLAGS) perlmain$(OBJ_EXT) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs) -!NO!SUBS! - -case "${osname}${osvers}" in -linux*|darwin*) - $spitshell >>$Makefile <<'!NO!SUBS!' -# Valgrind perl (currently Linux, Darwin only) - -perl.valgrind.config: config.sh - @echo "Checking usemymalloc='n' in config.sh..." - @grep "^usemymalloc=" config.sh - @grep "^usemymalloc='n'" config.sh >/dev/null || exit 1 - @echo "And of course you have to have valgrind..." - $(VALGRIND) $(VG_TEST) || exit 1 -!NO!SUBS! - ;; -esac - -$spitshell >>$Makefile <<'!NO!SUBS!' - # 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. @@ -1375,13 +1356,13 @@ linux*|darwin*) $spitshell >>$Makefile <<'!NO!SUBS!' # Targets for valgrind testing: -test_prep.valgrind: test_prep perl.valgrind - -test.valgrind check.valgrind: test_prep perl.valgrind.config +test.valgrind check.valgrind: test_prep + @echo "Checking usemymalloc='n' in config.sh..." + @grep "^usemymalloc=" config.sh + @grep "^usemymalloc='n'" config.sh >/dev/null || exit 1 + @echo "And of course you have to have valgrind..." + $(VALGRIND) $(VG_TEST) || exit 1 PERL_VALGRIND=1 VALGRIND='$(VALGRIND)' $(RUN_TESTS) choose - -test_notty.valgrind: test_prep.valgrind perl.valgrind.config - PERL_VALGRIND=1 $(RUN_TESTS) no-tty !NO!SUBS! ;; esac diff --git a/pod/perldelta.pod b/pod/perldelta.pod index 84db0e5..137b242 100644 --- a/pod/perldelta.pod +++ b/pod/perldelta.pod @@ -368,15 +368,16 @@ 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 + 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 perl.valgrind.config purecovperl + pureperl quantperl test.deparse test.taintwarn test.third + test.torture test.utf16 test.utf8 test_notty.deparse + test_notty.third test_notty.valgrind test_prep.third + test_prep.valgrind 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. -- Perl5 Master Repository
