#
# We are now checking that the correct use $version; is present in
# Makefile.PL and $module.pm
+
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
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'; }
-if ($^O eq 'MacOS') { $extracted_program = '::utils:h2xs'; }
+
+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 (!(-e $extracted_program)) {
print "1..0 # Skip: $extracted_program was not built\n";
exit 0;
# 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
-# 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
-}
+# ok on unix, nt, VMS, ...
+my $dupe = '2>&1';
+# ok on unix, nt, The extra \" are for VMS
+my $lib = '"-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;
+$thisversion =~ s/^v//;
+
+# If this test has failed previously a copy may be left.
+rmtree($name);
my @tests = (
"-f -n $name", $], <<"EOXSFILES",
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.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
+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.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
+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.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
+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.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
+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.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
+Writing $name/t/$name.t
Writing $name/Changes
Writing $name/MANIFEST
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.
+ # And 1 more to examine const-c.inc contents in tests that use $header.
# 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);
+ $total_tests++ if $tests[$i-2] =~ / \Q$header\E$/;
}
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
+#define Bactrian /* empty */
+#define Bactrian2
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)
# 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
- if ($^O eq 'MacOS') {
- $result =~ s/#\s*//gs;
- }
-
#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?
+ 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;
+ 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: $!";
+
+ if ($args =~ / \Q$header\E$/) {
+ my $const_c = File::Spec->catfile($name, 'fallback', 'const-c.inc');
+ my ($found, $diag);
+ if (!open FILE, '<', $const_c) {
+ $diag = "can't open $const_c: $!";
+ }
+ else {
+ while (<FILE>) {
+ next unless /\b Bactrian 2? \b/x;
+ $found = 1;
+ last;
+ }
}
- ok (-e $_, 1, "$_ missing");
+ ok (!$found, "generated $const_c has no Bactrian(2)");
+ diag ($diag) if defined $diag;
}
- 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), 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: $!";
}
}
rmtree($name);
}
-ok (unlink ($header), 1, $!);
+cmp_ok (unlink ($header), "==", 1, "unlink '$header'") or die "\$! is $!";
https://perl5.git.perl.org / perl5.git / blobdiff