fix PodParser testsuite; Pod::Text subsumes Pod::PlainText

p4raw-id: //depot/perl@4281

17 files changed, 64 insertions, 64 deletions

diff --git a/t/pod/emptycmd.t b/t/pod/emptycmd.t
index 59e395ea04..d348a9d278 100755
--- a/t/pod/emptycmd.t
+++ b/t/pod/emptycmd.t
@@ -1,7 +1,7 @@
+#!./perl
 BEGIN {
-   use File::Basename;
-   my $THISDIR = dirname $0;
-   unshift @INC, $THISDIR;
+   chdir 't' if -d 't';
+   unshift @INC, './pod', '../lib';
    require "testp2pt.pl";
    import TestPodIncPlainText;
 }
diff --git a/t/pod/for.t b/t/pod/for.t
index 44af44f17d..b8a6ec5c73 100755
--- a/t/pod/for.t
+++ b/t/pod/for.t
@@ -1,7 +1,7 @@
+#!./perl
 BEGIN {
-   use File::Basename;
-   my $THISDIR = dirname $0;
-   unshift @INC, $THISDIR;
+   chdir 't' if -d 't';
+   unshift @INC, './pod', '../lib';
    require "testp2pt.pl";
    import TestPodIncPlainText;
 }
diff --git a/t/pod/headings.t b/t/pod/headings.t
index 78608d0fd9..fc7b4b265b 100755
--- a/t/pod/headings.t
+++ b/t/pod/headings.t
@@ -1,7 +1,7 @@
+#!./perl
 BEGIN {
-   use File::Basename;
-   my $THISDIR = dirname $0;
-   unshift @INC, $THISDIR;
+   chdir 't' if -d 't';
+   unshift @INC, './pod', '../lib';
    require "testp2pt.pl";
    import TestPodIncPlainText;
 }
diff --git a/t/pod/include.t b/t/pod/include.t
index 4e73b78356..6d0b7e34e5 100755
--- a/t/pod/include.t
+++ b/t/pod/include.t
@@ -1,7 +1,7 @@
+#!./perl
 BEGIN {
-   use File::Basename;
-   my $THISDIR = dirname $0;
-   unshift @INC, $THISDIR;
+   chdir 't' if -d 't';
+   unshift @INC, './pod', '../lib';
    require "testp2pt.pl";
    import TestPodIncPlainText;
 }
diff --git a/t/pod/included.t b/t/pod/included.t
index 4f171c454b..0e31a090fc 100755
--- a/t/pod/included.t
+++ b/t/pod/included.t
@@ -1,7 +1,7 @@
+#!./perl
 BEGIN {
-   use File::Basename;
-   my $THISDIR = dirname $0;
-   unshift @INC, $THISDIR;
+   chdir 't' if -d 't';
+   unshift @INC, './pod', '../lib';
    require "testp2pt.pl";
    import TestPodIncPlainText;
 }
diff --git a/t/pod/lref.t b/t/pod/lref.t
index 02e2c9e307..e367d6dd66 100755
--- a/t/pod/lref.t
+++ b/t/pod/lref.t
@@ -1,7 +1,7 @@
+#!./perl
 BEGIN {
-   use File::Basename;
-   my $THISDIR = dirname $0;
-   unshift @INC, $THISDIR;
+   chdir 't' if -d 't';
+   unshift @INC, './pod', '../lib';
    require "testp2pt.pl";
    import TestPodIncPlainText;
 }
diff --git a/t/pod/multiline_items.t b/t/pod/multiline_items.t
index 0fe410a4e6..37e8d53069 100755
--- a/t/pod/multiline_items.t
+++ b/t/pod/multiline_items.t
@@ -1,7 +1,7 @@
+#!./perl
 BEGIN {
-   use File::Basename;
-   my $THISDIR = dirname $0;
-   unshift @INC, $THISDIR;
+   chdir 't' if -d 't';
+   unshift @INC, './pod', '../lib';
    require "testp2pt.pl";
    import TestPodIncPlainText;
 }
diff --git a/t/pod/nested_items.t b/t/pod/nested_items.t
index c8e9b22427..9c098018d1 100755
--- a/t/pod/nested_items.t
+++ b/t/pod/nested_items.t
@@ -1,7 +1,7 @@
+#!./perl
 BEGIN {
-   use File::Basename;
-   my $THISDIR = dirname $0;
-   unshift @INC, $THISDIR;
+   chdir 't' if -d 't';
+   unshift @INC, './pod', '../lib';
    require "testp2pt.pl";
    import TestPodIncPlainText;
 }
diff --git a/t/pod/nested_seqs.t b/t/pod/nested_seqs.t
index 8559f1f25f..6a5405bf47 100755
--- a/t/pod/nested_seqs.t
+++ b/t/pod/nested_seqs.t
@@ -1,7 +1,7 @@
+#!./perl
 BEGIN {
-   use File::Basename;
-   my $THISDIR = dirname $0;
-   unshift @INC, $THISDIR;
+   chdir 't' if -d 't';
+   unshift @INC, './pod', '../lib';
    require "testp2pt.pl";
    import TestPodIncPlainText;
 }
diff --git a/t/pod/oneline_cmds.t b/t/pod/oneline_cmds.t
index 28bd1d09e5..3081ef4dc3 100755
--- a/t/pod/oneline_cmds.t
+++ b/t/pod/oneline_cmds.t
@@ -1,7 +1,7 @@
+#!./perl
 BEGIN {
-   use File::Basename;
-   my $THISDIR = dirname $0;
-   unshift @INC, $THISDIR;
+   chdir 't' if -d 't';
+   unshift @INC, './pod', '../lib';
    require "testp2pt.pl";
    import TestPodIncPlainText;
 }
diff --git a/t/pod/pod2usage.t b/t/pod/pod2usage.t
index cf2c31b83f..bceeeefce8 100755
--- a/t/pod/pod2usage.t
+++ b/t/pod/pod2usage.t
@@ -1,7 +1,7 @@
+#!./perl
 BEGIN {
-   use File::Basename;
-   my $THISDIR = dirname $0;
-   unshift @INC, $THISDIR;
+   chdir 't' if -d 't';
+   unshift @INC, './pod', '../lib';
    require "testp2pt.pl";
    import TestPodIncPlainText;
 }
diff --git a/t/pod/poderrs.t b/t/pod/poderrs.t
index 591bd2a86d..9cbbeeeb91 100755
--- a/t/pod/poderrs.t
+++ b/t/pod/poderrs.t
@@ -1,7 +1,7 @@
+#!./perl
 BEGIN {
-   use File::Basename;
-   my $THISDIR = dirname $0;
-   unshift @INC, $THISDIR;
+   chdir 't' if -d 't';
+   unshift @INC, './pod', '../lib';
    require "testpchk.pl";
    import TestPodChecker;
 }
diff --git a/t/pod/poderrs.xr b/t/pod/poderrs.xr
index bbad674e84..82d402d8b2 100644
--- a/t/pod/poderrs.xr
+++ b/t/pod/poderrs.xr
@@ -1,11 +1,11 @@
-*** ERROR: Unknown command "unknown1" at line 21 in file t/pod/poderrs.t
-*** ERROR: Unknown interior-sequence "N" at line 21 in file t/pod/poderrs.t
-*** ERROR: Unknown interior-sequence "D" at line 22 in file t/pod/poderrs.t
-*** ERROR: Unknown interior-sequence "Q" at line 25 in file t/pod/poderrs.t
-*** ERROR: Unknown interior-sequence "A" at line 26 in file t/pod/poderrs.t
-*** ERROR: Unknown interior-sequence "V" at line 27 in file t/pod/poderrs.t
-*** ERROR: Unknown interior-sequence "Y" at line 27 in file t/pod/poderrs.t
-** Unterminated B<...> at t/pod/poderrs.t line 31
-** Unterminated I<...> at t/pod/poderrs.t line 30
-** Unterminated C<...> at t/pod/poderrs.t line 33
-t/pod/poderrs.t has 10 pod syntax errors.
+*** ERROR: Unknown command "unknown1" at line 21 in file pod/poderrs.t
+*** ERROR: Unknown interior-sequence "N" at line 21 in file pod/poderrs.t
+*** ERROR: Unknown interior-sequence "D" at line 22 in file pod/poderrs.t
+*** ERROR: Unknown interior-sequence "Q" at line 25 in file pod/poderrs.t
+*** ERROR: Unknown interior-sequence "A" at line 26 in file pod/poderrs.t
+*** ERROR: Unknown interior-sequence "V" at line 27 in file pod/poderrs.t
+*** ERROR: Unknown interior-sequence "Y" at line 27 in file pod/poderrs.t
+** Unterminated B<...> at pod/poderrs.t line 31
+** Unterminated I<...> at pod/poderrs.t line 30
+** Unterminated C<...> at pod/poderrs.t line 33
+pod/poderrs.t has 10 pod syntax errors.
diff --git a/t/pod/podselect.t b/t/pod/podselect.t
index 0004548cb7..30eb30c9b0 100755
--- a/t/pod/podselect.t
+++ b/t/pod/podselect.t
@@ -1,7 +1,7 @@
+#!./perl
 BEGIN {
-   use File::Basename;
-   my $THISDIR = dirname $0;
-   unshift @INC, $THISDIR;
+   chdir 't' if -d 't';
+   unshift @INC, './pod', '../lib';
    require "testp2pt.pl";
    import TestPodIncPlainText;
 }
diff --git a/t/pod/special_seqs.t b/t/pod/special_seqs.t
index 1b31387dd3..572fb8c061 100755
--- a/t/pod/special_seqs.t
+++ b/t/pod/special_seqs.t
@@ -1,7 +1,7 @@
+#!./perl
 BEGIN {
-   use File::Basename;
-   my $THISDIR = dirname $0;
-   unshift @INC, $THISDIR;
+   chdir 't' if -d 't';
+   unshift @INC, './pod', '../lib';
    require "testp2pt.pl";
    import TestPodIncPlainText;
 }
diff --git a/t/pod/testp2pt.pl b/t/pod/testp2pt.pl
index d917ad9d21..234a5271c4 100644
--- a/t/pod/testp2pt.pl
+++ b/t/pod/testp2pt.pl
@@ -45,7 +45,7 @@ $INSTDIR = (dirname $INSTDIR) if (basename($INSTDIR) eq 'xtra');
 $INSTDIR = (dirname $INSTDIR) if (basename($INSTDIR) eq 'pod');
 $INSTDIR = (dirname $INSTDIR) if (basename($INSTDIR) eq 't');
 my @PODINCDIRS = ( catfile($INSTDIR, 'lib', 'Pod'),
-                   catfile($INSTDIR, 'scripts'),
+                   catfile($INSTDIR, 'pod'),
                    catfile($INSTDIR, 't', 'pod'),
                    catfile($INSTDIR, 't', 'pod', 'xtra')
                  );
@@ -119,7 +119,7 @@ sub testpodinc2plaintext( @ ) {
       return  $msg;
    }
 
-   print "+ Running testpodinc2plaintext for '$testname'...\n";
+   print "# Running testpodinc2plaintext for '$testname'...\n";
    ## Compare the output against the expected result
    podinc2plaintext($infile, $outfile);
    if ( testcmp($outfile, $cmpfile) ) {
@@ -153,12 +153,12 @@ sub testpodplaintext( @ ) {
       if ($opts{'-xrgen'}) {
           if ($opts{'-force'} or ! -e $cmpfile) {
              ## Create the comparison file
-             print "+ Creating expected result for \"$testname\"" .
+             print "# Creating expected result for \"$testname\"" .
                    " pod2plaintext test ...\n";
              podinc2plaintext($podfile, $cmpfile);
           }
           else {
-             print "+ File $cmpfile already exists" .
+             print "# File $cmpfile already exists" .
                    " (use '-force' to regenerate it).\n";
           }
           next;
@@ -170,13 +170,13 @@ sub testpodplaintext( @ ) {
                         -Cmp => $cmpfile;
       if ($failmsg) {
           ++$failed;
-          print "+\tFAILED. ($failmsg)\n";
+          print "#\tFAILED. ($failmsg)\n";
 	  print "not ok ", $failed+$passes, "\n";
       }
       else {
           ++$passes;
           unlink($outfile);
-          print "+\tPASSED.\n";
+          print "#\tPASSED.\n";
 	  print "ok ", $failed+$passes, "\n";
       }
    }
diff --git a/t/pod/testpchk.pl b/t/pod/testpchk.pl
index cd3c13816d..07236e69e7 100644
--- a/t/pod/testpchk.pl
+++ b/t/pod/testpchk.pl
@@ -62,7 +62,7 @@ sub testpodcheck( @ ) {
       return  $msg;
    }
 
-   print "+ Running podchecker for '$testname'...\n";
+   print "# Running podchecker for '$testname'...\n";
    ## Compare the output against the expected result
    podchecker($infile, $outfile);
    if ( testcmp({'-cmplines' => \&msgcmp}, $outfile, $cmpfile) ) {
@@ -96,12 +96,12 @@ sub testpodchecker( @ ) {
       if ($opts{'-xrgen'}) {
           if ($opts{'-force'} or ! -e $cmpfile) {
              ## Create the comparison file
-             print "+ Creating expected result for \"$testname\"" .
+             print "# Creating expected result for \"$testname\"" .
                    " podchecker test ...\n";
              podchecker($podfile, $cmpfile);
           }
           else {
-             print "+ File $cmpfile already exists" .
+             print "# File $cmpfile already exists" .
                    " (use '-force' to regenerate it).\n";
           }
           next;
@@ -113,13 +113,13 @@ sub testpodchecker( @ ) {
                         -Cmp => $cmpfile;
       if ($failmsg) {
           ++$failed;
-          print "+\tFAILED. ($failmsg)\n";
+          print "#\tFAILED. ($failmsg)\n";
 	  print "not ok ", $failed+$passes, "\n";
       }
       else {
           ++$passes;
           unlink($outfile);
-          print "+\tPASSED.\n";
+          print "#\tPASSED.\n";
 	  print "ok ", $failed+$passes, "\n";
       }
    }