X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fh2xs.t;h=5acc0b2c21fb00dba789607a3f975cf8077aca8c;hb=5fef21a34e2a36dc7c83d55110ccc5c57cc7d14d;hp=c237031c6eac164015dd15bfca0fcda0ed7fa604;hpb=46b277d5d6cbd510d69c01221748d4e1e88a72bb;p=p5sagit%2Fp5-mst-13.2.git diff --git a/lib/h2xs.t b/lib/h2xs.t index c237031..5acc0b2 100644 --- a/lib/h2xs.t +++ b/lib/h2xs.t @@ -5,6 +5,9 @@ # hence are not checked. File existence is checked with -e though. # This test depends on File::Path::rmtree() to clean up with. # - pvhp +# +# We are now checking that the correct use $version; is present in +# Makefile.PL and $module.pm BEGIN { chdir 't' if -d 't'; @@ -13,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'; } @@ -26,23 +34,60 @@ if (!(-e $extracted_program)) { # You might also wish to bail out if your perl platform does not # do `$^X -e 'warn "Writing h2xst"' 2>&1`; duplicity. -my $dupe = '2>&1'; # ok on unix, nt, VMS, ... -my $lib = '"-I../lib"'; # ok on unix, nt, The extra \" are for VMS +# ok on unix, nt, VMS, ... +my $dupe = '2>&1'; +# ok on unix, nt, The extra \" are for VMS +my $lib = '"-I../lib" "-I../../lib"'; # The >&1 would create a file named &1 on MPW (STDERR && STDOUT are # already merged). if ($^O eq 'MacOS') { $dupe = ''; - $lib = '-x -I::lib:'; # -x overcomes MPW $Config{startperl} anomaly + # -x overcomes MPW $Config{startperl} anomaly + $lib = '-x -I::lib: -I:::lib:'; } # $name should differ from system header file names and must # not already be found in the t/ subdirectory for perl. my $name = 'h2xst'; my $header = "$name.h"; +my $thisversion = sprintf "%vd", $^V; my @tests = ( -"-f -n $name", <<"EOXSFILES", +"-f -n $name", $], <<"EOXSFILES", +Defaulting to backwards compatibility with perl $thisversion +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/$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/Changes +Writing $name/MANIFEST +EOXSFILES + +"-f -n $name -b $thisversion", $], <<"EOXSFILES", +Writing $name/ppport.h +Writing $name/$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/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/$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 @@ -50,7 +95,20 @@ Writing $name/Changes Writing $name/MANIFEST EOXSFILES -"\"-X\" -f -n $name", <<"EONOXSFILES", +"-f -n $name -b 5.5.3", "5.00503", <<"EOXSFILES", +Writing $name/ppport.h +Writing $name/$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/Changes +Writing $name/MANIFEST +EOXSFILES + +"\"-X\" -f -n $name -b $thisversion", $], <<"EONOXSFILES", Writing $name/$name.pm Writing $name/Makefile.PL Writing $name/README @@ -59,9 +117,12 @@ Writing $name/Changes Writing $name/MANIFEST EONOXSFILES -"-f -n $name $header", <<"EOXSFILES", +"-f -n $name $header -b $thisversion", $], <<"EOXSFILES", +Writing $name/ppport.h Writing $name/$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 @@ -71,28 +132,30 @@ EOXSFILES ); my $total_tests = 3; # opening, closing and deleting the header file. -for (my $i = $#tests; $i > 0; $i-=2) { +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 += 2 + (() = $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 <
&1 dupe: # 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 @@ -103,20 +166,53 @@ while (my ($args, $expectation) = splice @tests, 0, 2) { #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); - $expectation =~ s/Writing //; # remove leader - foreach (split(/Writing /,$expectation)) { - chomp; # remove \n + 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"); + if ($^O eq 'VMS') { + $_ .= '.' unless $_ =~ m/\./; + $_ = lc($_) unless exists $got{$_}; + } + 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), "open $file")) { + my $match = qr/use $version;/; + my $found; + while () { + last if $found = /$match/; + } + ok ($found, "looking for /$match/ in $file"); + close FILE or die "close $file: $!"; + } + } # clean up rmtree($name); } -ok (unlink ($header), 1, $!); +cmp_ok (unlink ($header), "==", 1, "unlink '$header'") or die "\$! is $!";