X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fh2xs.t;h=7d037f39516b6019a76b9bdc6e9c24001b1f700f;hb=55ec0dff636c2a8ee5225314d7d46f928ab7f6da;hp=53739b2baf3c0b58f57be293e3371fb5f61f1e1a;hpb=1cb0fb506639f41107792256805556ee04e5463a;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/h2xs.t b/lib/h2xs.t
index 53739b2..7d037f3 100644
--- a/lib/h2xs.t
+++ b/lib/h2xs.t
@@ -12,6 +12,12 @@
 BEGIN {
     chdir 't' if -d 't';
     @INC = '../lib';
+    # FIXME (or rather FIXh2xs)
+    require Config;
+    if (($Config::Config{'extensions'} !~ m!\bDevel/PPPort\b!) ){
+	print "1..0 # Skip -- Perl configured without Devel::PPPort module\n";
+	exit 0;
+    }
 }
 
 # use strict; # we are not really testing this
@@ -25,7 +31,28 @@ $ExtUtils::Manifest::Quiet=1;
 my $up = File::Spec->updir();
 
 my $extracted_program = '../utils/h2xs'; # unix, nt, ...
-if ($^O eq 'VMS') { $extracted_program = '[-.utils]h2xs.com'; }
+
+my $Is_VMS_traildot = 0;
+if ($^O eq 'VMS') {
+    $extracted_program = '[-.utils]h2xs.com';
+
+    # We have to know if VMS is in UNIX mode.  In UNIX mode, trailing dots
+    # should not be present.  There are actually two settings that control this.
+
+    $Is_VMS_traildot = 1;
+    my $unix_rpt = 0;
+    my $drop_dot = 0;
+    if (eval 'require VMS::Feature') {
+        $unix_rpt = VMS::Feature::current('filename_unix_report');
+        $drop_dot = VMS::Feature::current('readdir_dropdotnotype');
+    } else {
+        my $unix_report = $ENV{'DECC$FILENAME_UNIX_REPORT'} || '';
+        $unix_rpt = $unix_report =~ /^[ET1]/i; 
+        my $drop_dot_notype = $ENV{'DECC$READDIR_DROPDOTNOTYPE'} || '';
+        $drop_dot = $drop_dot_notype =~ /^[ET1]/i;
+    }
+    $Is_VMS_traildot = 0 if $drop_dot && unix_rpt;
+}
 if ($^O eq 'MacOS') { $extracted_program = '::utils:h2xs'; }
 if (!(-e $extracted_program)) {
     print "1..0 # Skip: $extracted_program was not built\n";
@@ -50,6 +77,10 @@ if ($^O eq 'MacOS') {
 my $name = 'h2xst';
 my $header = "$name.h";
 my $thisversion = sprintf "%vd", $^V;
+$thisversion =~ s/^v//;
+
+# If this test has failed previously a copy may be left.
+rmtree($name);
 
 my @tests = (
 "-f -n $name", $], <<"EOXSFILES",
@@ -58,74 +89,74 @@ If you intend this module to be compatible with earlier perl versions, please
 specify a minimum perl version with the -b option.
 
 Writing $name/ppport.h
-Writing $name/$name.pm
+Writing $name/lib/$name.pm
 Writing $name/$name.xs
 Writing $name/fallback/const-c.inc
 Writing $name/fallback/const-xs.inc
 Writing $name/Makefile.PL
 Writing $name/README
-Writing $name/t/1.t
+Writing $name/t/$name.t
 Writing $name/Changes
 Writing $name/MANIFEST
 EOXSFILES
 
 "-f -n $name -b $thisversion", $], <<"EOXSFILES",
 Writing $name/ppport.h
-Writing $name/$name.pm
+Writing $name/lib/$name.pm
 Writing $name/$name.xs
 Writing $name/fallback/const-c.inc
 Writing $name/fallback/const-xs.inc
 Writing $name/Makefile.PL
 Writing $name/README
-Writing $name/t/1.t
+Writing $name/t/$name.t
 Writing $name/Changes
 Writing $name/MANIFEST
 EOXSFILES
 
 "-f -n $name -b 5.6.1", "5.006001", <<"EOXSFILES",
 Writing $name/ppport.h
-Writing $name/$name.pm
+Writing $name/lib/$name.pm
 Writing $name/$name.xs
 Writing $name/fallback/const-c.inc
 Writing $name/fallback/const-xs.inc
 Writing $name/Makefile.PL
 Writing $name/README
-Writing $name/t/1.t
+Writing $name/t/$name.t
 Writing $name/Changes
 Writing $name/MANIFEST
 EOXSFILES
 
 "-f -n $name -b 5.5.3", "5.00503", <<"EOXSFILES",
 Writing $name/ppport.h
-Writing $name/$name.pm
+Writing $name/lib/$name.pm
 Writing $name/$name.xs
 Writing $name/fallback/const-c.inc
 Writing $name/fallback/const-xs.inc
 Writing $name/Makefile.PL
 Writing $name/README
-Writing $name/t/1.t
+Writing $name/t/$name.t
 Writing $name/Changes
 Writing $name/MANIFEST
 EOXSFILES
 
 "\"-X\" -f -n $name -b $thisversion", $], <<"EONOXSFILES",
-Writing $name/$name.pm
+Writing $name/lib/$name.pm
 Writing $name/Makefile.PL
 Writing $name/README
-Writing $name/t/1.t
+Writing $name/t/$name.t
 Writing $name/Changes
 Writing $name/MANIFEST
 EONOXSFILES
 
-"-f -n $name $header -b $thisversion", $], <<"EOXSFILES",
+"-f -n $name -b $thisversion $header", $], <<"EOXSFILES",
 Writing $name/ppport.h
-Writing $name/$name.pm
+Writing $name/lib/$name.pm
 Writing $name/$name.xs
 Writing $name/fallback/const-c.inc
 Writing $name/fallback/const-xs.inc
 Writing $name/Makefile.PL
 Writing $name/README
-Writing $name/t/1.t
+Writing $name/t/$name.t
 Writing $name/Changes
 Writing $name/MANIFEST
 EOXSFILES
@@ -134,7 +165,7 @@ EOXSFILES
 my $total_tests = 3; # opening, closing and deleting the header file.
 for (my $i = $#tests; $i > 0; $i-=3) {
   # 1 test for running it, 1 test for the expected result, and 1 for each file
-  # plus 1 to open and 1 to check for the use in $name.pm and Makefile.PL
+  # plus 1 to open and 1 to check for the use in lib/$name.pm and Makefile.PL
   # And 1 more for our check for "bonus" files, 2 more for ExtUtil::Manifest.
   # use the () to force list context and hence count the number of matches.
   $total_tests += 9 + (() = $tests[$i] =~ /(Writing)/sg);
@@ -176,6 +207,12 @@ while (my ($args, $version, $expectation) = splice @tests, 0, 3) {
       $_ = ':' . join(':',split(/\//,$_));
       $_ =~ s/$name:t:1.t/$name:t\/1.t/; # is this an h2xs bug?
     }
+    if ($^O eq 'VMS') {
+      if ($Is_VMS_traildot) {
+          $_ .= '.' unless $_ =~ m/\./;
+      }
+      $_ = lc($_) unless exists $got{$_};
+    }
     ok (-e $_, "check for $_") and delete $got{$_};
   }
   my @extra = keys %got;
@@ -195,7 +232,7 @@ while (my ($args, $version, $expectation) = splice @tests, 0, 3) {
   pop @INC;
   chdir ($up) or die "chdir $up failed: $!";
  
-  foreach my $leaf ("$name.pm", 'Makefile.PL') {
+  foreach my $leaf (File::Spec->catfile('lib', "$name.pm"), 'Makefile.PL') {
     my $file = File::Spec->catfile($name, $leaf);
     if (ok (open (FILE, $file), "open $file")) {
       my $match = qr/use $version;/;