(was Re: [PATCH @13746] h2xs)

Message-ID: <20020304224837.GA4284@Bagpuss.unfortu.net>

p4raw-id: //depot/perl@15023

1 files changed, 45 insertions, 20 deletions

diff --git a/lib/h2xs.t b/lib/h2xs.t
index d1ddc0500a..53739b2baf 100644
--- a/lib/h2xs.t
+++ b/lib/h2xs.t
@@ -16,8 +16,13 @@ BEGIN {
 
 # use strict; # we are not really testing this
 use File::Path;  # for cleaning up with rmtree()
-use Test;
+use Test::More;
 use File::Spec;
+use File::Find;
+use ExtUtils::Manifest;
+# Don't want its diagnostics getting in the way of ours.
+$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'; }
@@ -55,8 +60,8 @@ specify a minimum perl version with the -b option.
 Writing $name/ppport.h
 Writing $name/$name.pm
 Writing $name/$name.xs
-Writing $name/fallback.c
-Writing $name/fallback.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
@@ -68,8 +73,8 @@ EOXSFILES
 Writing $name/ppport.h
 Writing $name/$name.pm
 Writing $name/$name.xs
-Writing $name/fallback.c
-Writing $name/fallback.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
@@ -81,8 +86,8 @@ EOXSFILES
 Writing $name/ppport.h
 Writing $name/$name.pm
 Writing $name/$name.xs
-Writing $name/fallback.c
-Writing $name/fallback.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
@@ -94,8 +99,8 @@ EOXSFILES
 Writing $name/ppport.h
 Writing $name/$name.pm
 Writing $name/$name.xs
-Writing $name/fallback.c
-Writing $name/fallback.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
@@ -116,8 +121,8 @@ EONOXSFILES
 Writing $name/ppport.h
 Writing $name/$name.pm
 Writing $name/$name.xs
-Writing $name/fallback.c
-Writing $name/fallback.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
@@ -130,18 +135,19 @@ 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
+  # 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 += 6 + (() = $tests[$i] =~ /(Writing)/sg);
+  $total_tests += 9 + (() = $tests[$i] =~ /(Writing)/sg);
 }
 
 plan tests => $total_tests;
 
-ok (open (HEADER, ">$header"));
+ok (open (HEADER, ">$header"), "open '$header'");
 print HEADER <<HEADER or die $!;
 #define Camel 2
 #define Dromedary 1
 HEADER
-ok (close (HEADER));
+ok (close (HEADER), "close '$header'");
 
 while (my ($args, $version, $expectation) = splice @tests, 0, 3) {
   # h2xs warns about what it is writing hence the (possibly unportable)
@@ -149,7 +155,7 @@ while (my ($args, $version, $expectation) = splice @tests, 0, 3) {
   # does it run?
   my $prog = "$^X $lib $extracted_program $args $dupe";
   @result = `$prog`;
-  ok ($?, 0, "running $prog ");
+  cmp_ok ($?, "==", 0, "running $prog ");
   $result = join("",@result);
 
   # accomodate MPW # comment character prependage
@@ -160,25 +166,44 @@ while (my ($args, $version, $expectation) = splice @tests, 0, 3) {
   #print "# expectation is >$expectation<\n";
   #print "# result is >$result<\n";
   # Was the output the list of files that were expected?
-  ok ($result, $expectation, "running $prog");
+  is ($result, $expectation, "running $prog");
+
+  my (%got);
+  find (sub {$got{$File::Find::name}++ unless -d $_}, $name);
 
   foreach ($expectation =~ /Writing\s+(\S+)/gm) {
     if ($^O eq 'MacOS') {
       $_ = ':' . join(':',split(/\//,$_));
       $_ =~ s/$name:t:1.t/$name:t\/1.t/; # is this an h2xs bug?
     }
-    ok (-e $_, 1, "$_ missing");
+    ok (-e $_, "check for $_") and delete $got{$_};
+  }
+  my @extra = keys %got;
+  unless (ok (!@extra, "Are any extra files present?")) {
+    print "# These files are unexpectedly present:\n";
+    print "# $_\n" foreach sort @extra;
   }
 
+  chdir ($name) or die "chdir $name failed: $!";
+  # Aargh. Something wants to load a bit of regexp. And we have to chdir
+  # for ExtUtils::Manifest. Caught between a rock and a hard place, so this
+  # seems the least evil thing to do:
+  push @INC, "../../lib";
+  my ($missing, $extra) = ExtUtils::Manifest::fullcheck();
+  is_deeply ($missing, [], "No files in the MANIFEST should be missing");
+  is_deeply ($extra, [],   "and all files present should be in the MANIFEST");
+  pop @INC;
+  chdir ($up) or die "chdir $up failed: $!";
+ 
   foreach my $leaf ("$name.pm", 'Makefile.PL') {
     my $file = File::Spec->catfile($name, $leaf);
-    if (ok (open (FILE, $file), 1, "open $file")) {
+    if (ok (open (FILE, $file), "open $file")) {
       my $match = qr/use $version;/;
       my $found;
       while (<FILE>) {
         last if $found = /$match/;
       }
-      ok ($found, 1, "looking for /$match/ in $file");
+      ok ($found, "looking for /$match/ in $file");
       close FILE or die "close $file: $!";
     }
   }
@@ -186,4 +211,4 @@ while (my ($args, $version, $expectation) = splice @tests, 0, 3) {
   rmtree($name);
 }
 
-ok (unlink ($header), 1, $!);
+cmp_ok (unlink ($header), "==", 1, "unlink '$header'") or die "\$! is $!";