In perl.git, the branch smoke-me/gsoc-pod has been updated <http://perl5.git.perl.org/perl.git/commitdiff/2427ee134b41e77a5b7400a01d0d1a3108b36719?hp=12721c373648cc8536f05dbb5aad15e6517b1572>
- Log ----------------------------------------------------------------- commit 2427ee134b41e77a5b7400a01d0d1a3108b36719 Author: Marc Green <[email protected]> Date: Wed Jun 29 15:20:47 2011 -0400 Update for smoking ----------------------------------------------------------------------- Summary of changes: MANIFEST | 22 +++++++++++++++- ext/Pod-Html/t/htmldir3.t | 2 +- ext/Pod-Html/t/old/old2new.pl | 52 ---------------------------------------- ext/Pod-Html/t/pod2html-lib.pl | 20 ++------------- 4 files changed, 24 insertions(+), 72 deletions(-) delete mode 100644 ext/Pod-Html/t/old/old2new.pl diff --git a/MANIFEST b/MANIFEST index 5fde71d..74925c3 100644 --- a/MANIFEST +++ b/MANIFEST @@ -3501,8 +3501,24 @@ ext/PerlIO-via/hints/aix.pl Hint for PerlIO::via for named architecture ext/PerlIO-via/t/via.t See if PerlIO::via works ext/PerlIO-via/via.pm PerlIO layer for layers in perl ext/PerlIO-via/via.xs PerlIO layer for layers in perl -ext/Pod-Html/Html.pm Convert POD data to HTML -ext/Pod-Html/pod2html.PL Precursor for translator to turn pod into HTML +ext/Pod-Html/lib/Pod/Html.pm Convert POD data to HTML +ext/Pod-Html/lib/pod2html.PL Precursor for translator to turn pod into HTML +ext/Pod-Html/t/htmlcrossref.t pod2html cross reference test +ext/Pod-Html/t/htmlcrossref.pod pod2html cross reference test input data +ext/Pod-Html/t/htmldir.t pod2html --htmldir test 1 +ext/Pod-Html/t/htmldir.pod pod2html --htmldir test input data 1 +ext/Pod-Html/t/htmldir2.t pod2html --htmldir test 2 +ext/Pod-Html/t/htmldir2.pod pod2html --htmldir test input data 2 +ext/Pod-Html/t/htmldir3.t pod2html --htmldir test 3 +ext/Pod-Html/t/htmldir3.pod pod2html --htmldir test input data 3 +ext/Pod-Html/t/htmldir4.t pod2html --htmldir test 4 +ext/Pod-Html/t/htmldir4.pod pod2html --htmldir test input data 4 +ext/Pod-Html/t/htmldir5.t pod2html --htmldir test 5 +ext/Pod-Html/t/htmldir5.pod pod2html --htmldir test input data 5 +ext/Pod-Html/t/htmlfeature.t pod2html feature set test 1 +ext/Pod-Html/t/htmlfeature.pod pod2html feature set test input data 1 +ext/Pod-Html/t/htmlfeature2.t pod2html feature set test 2 +ext/Pod-Html/t/htmlfeature2.pod pod2html feature set test input data 2 ext/Pod-Html/t/htmlescp.pod pod2html escape test input data ext/Pod-Html/t/htmlescp.t pod2html escape test ext/Pod-Html/t/htmllink.pod pod2html link test input data @@ -3510,6 +3526,8 @@ ext/Pod-Html/t/htmllink.t pod2html link test ext/Pod-Html/t/htmlview.pod pod2html render test input data ext/Pod-Html/t/htmlview.t pod2html render test ext/Pod-Html/t/pod2html-lib.pl pod2html testing library +ext/Pod-Html/test.lib/perlpodspec.pod test POD document +ext/Pod-Html/test.lib/perlvar.pod test POD document ext/POSIX/hints/bsdos.pl Hint for POSIX for named architecture ext/POSIX/hints/dynixptx.pl Hint for POSIX for named architecture ext/POSIX/hints/freebsd.pl Hint for POSIX for named architecture diff --git a/ext/Pod-Html/t/htmldir3.t b/ext/Pod-Html/t/htmldir3.t index 0b5e6ff..e5f6b79 100644 --- a/ext/Pod-Html/t/htmldir3.t +++ b/ext/Pod-Html/t/htmldir3.t @@ -29,7 +29,7 @@ convert_n_test("htmldir3", "test --htmldir and --htmlroot 3b", "--podpath=$relcwd/t", "--podroot=/", "--htmldir=t", - "--outfile=t/htmldir4.html", + "--outfile=t/htmldir3.html", ); __DATA__ diff --git a/ext/Pod-Html/t/old/old2new.pl b/ext/Pod-Html/t/old/old2new.pl deleted file mode 100644 index 7d0e5cc..0000000 --- a/ext/Pod-Html/t/old/old2new.pl +++ /dev/null @@ -1,52 +0,0 @@ -#!/usr/bin/perl -use 5.14.0; -use warnings; -$^I = '.bak'; # in place editng -$/ = undef; # slurp whole file - -# Convert old Pod::Html tests to new Pod::Html tests -# Does basic conversion, simplifying the conversion by hand process -# XXX: Watch out for [(REL)CURRENTWORKINGDIR] being s///'d, put it back after copy/paste - -my $bindex = qr| -<!-- INDEX BEGIN --> -<div name="index"> -<p><a name="__index__"></a></p> -(?:<!--)?\s+<ul> - -|; - -my $eindex = qr|\s*(?:-->\s*)?</div> -<!-- INDEX END --> - -|; - -while (<>) { - # keep it [PERLADMIN] - s#<link rev="made" href="mailto:.+?"; />#<link rev="made" href="mailto:[PERLADMIN]"; />#; - - s#<title>.+?</title>#<title></title>#; - s#$bindex#\n<ul id="index">\n#; - s#$eindex#\n#; - s#</html>\s*#</html>\n\n\n#; # ::xhtml adds newlines - - s#<hr.*? />##g; # remove <hr>s - s#<p>\n</p>##g; # remove <p></p>s - s#(<p>[^\n].+?</p>)#$1\n#g; # space out <p>s - s/">(.+?) in the (.+?) manpage/">"$1" in $2/g; - s/the (.+?) manpage/$1/g; - s#<em>(.+?)</em>#<a>$1</a>#g; # links not found - s/class="block"/class="_podblock_"/g; # from --header - - - # index elements - # Note: only works for sections w/o inner <ul>s b/c new Pod::Html handles them differently - s|<li><a href="#(.+?)">(.+?)(?{ (\1 =~ tr/_/ /r) eq lc(\2) })</a></li>| - '<li><a href="#' . $2 =~ tr/_/-/r . "\">$2</a></li>"|eg; - - # anchored =head1 -> id'd =head1 - s#<h(\d)><a name="(.+?)">(.+?)(?{ (\2 =~ tr/_/ /r) eq lc(\3) })</a></h\1># - "<h$1 id=\"" . ($3 =~ tr/ /-/r) . "\">$3</h$1>\n"#eg; - - print; -} diff --git a/ext/Pod-Html/t/pod2html-lib.pl b/ext/Pod-Html/t/pod2html-lib.pl index 5b49700..1d1e60c 100644 --- a/ext/Pod-Html/t/pod2html-lib.pl +++ b/ext/Pod-Html/t/pod2html-lib.pl @@ -2,7 +2,6 @@ require Cwd; require Pod::Html; require Config; use File::Spec::Functions; -use 5.14.0; sub convert_n_test { my($podfile, $testname, @p2h_args) = @_; @@ -24,6 +23,7 @@ sub convert_n_test { "--podpath=t", "--htmlroot=/", "--podroot=$cwd", + "--quiet", @p2h_args, ); @@ -47,25 +47,11 @@ sub convert_n_test { } ok($expect eq $result, $testname) or do { - my $diff = '/bin/diff'; - -x $diff or $diff = '/usr/bin/diff'; - if (-x $diff) { - my $expectfile = "pod2html-lib.tmp"; - open my $tmpfile, ">", $expectfile or die $!; - print $tmpfile $expect; - close $tmpfile; - my $diffopt = $^O eq 'linux' ? 'u' : 'c'; - open my $diff, "diff -$diffopt $expectfile $outfile |" or die $!; - print "# $_" while <$diff>; - close $diff; - unlink $expectfile; - } + warn "\nExpected:\n$expect\n\nResult:\n$result\n\n"; }; # pod2html creates these -# 1 while unlink $outfile; - 1 while unlink "pod2htmd.tmp"; - 1 while unlink "pod2htmi.tmp"; + 1 while unlink $outfile; } 1; -- Perl5 Master Repository
