diff options
| author | Craig A. Berry <craigberry@mac.com> | 2016-01-28 13:44:07 -0600 |
|---|---|---|
| committer | Craig A. Berry <craigberry@mac.com> | 2016-01-30 12:42:17 -0600 |
| commit | d42e1eb74e834d1cf3ac4b5c9bd3527c3d5da67b (patch) | |
| tree | f9d4e57bd2ae05be3df685a76b0d0057455321a5 /t/porting | |
| parent | d9a72bf2e96ce4f217a832a9106c027edfdc45f3 (diff) | |
| download | perl-d42e1eb74e834d1cf3ac4b5c9bd3527c3d5da67b.tar.gz | |
Integrate podlators 4.05.
Diffstat (limited to 't/porting')
| -rw-r--r-- | t/porting/customized.dat | 3 | ||||
| -rw-r--r-- | t/porting/dual-life.t | 14 |
2 files changed, 11 insertions, 6 deletions
diff --git a/t/porting/customized.dat b/t/porting/customized.dat index d5b81e3fc2..c356bb766a 100644 --- a/t/porting/customized.dat +++ b/t/porting/customized.dat @@ -55,7 +55,6 @@ Win32API::File cpan/Win32API-File/t/file.t 124e64aa77e755235eb297644a87fac5388d3 Win32API::File cpan/Win32API-File/t/tie.t 712ea7edd0cc805ce1c0b8172c01b03dd19b583d Win32API::File cpan/Win32API-File/typemap 24bff088babeadac0873e8df390d1666d9d9db4a autodie cpan/autodie/t/mkdir.t 9e70d2282a3cc7d76a78bf8144fccba20fb37dac -podlators cpan/podlators/scripts/pod2man.PL f81acf53f3ff46cdcc5ebdd661c5d13eb35d20d6 -podlators cpan/podlators/scripts/pod2text.PL b4693fcfe4a0a1b38a215cfb8985a65d5d025d69 +podlators cpan/podlators/Makefile.PL d99c9f93d4b26ec27400d41227b6bcd155f48ba0 version cpan/version/lib/version.pm d0923b895d57f1d669ae36fcf85c87b16db341d1 version vutil.c 668f17ca43e2527645674d29ba772b86330d5663 diff --git a/t/porting/dual-life.t b/t/porting/dual-life.t index 27daf46858..d7d62d717d 100644 --- a/t/porting/dual-life.t +++ b/t/porting/dual-life.t @@ -5,6 +5,7 @@ use strict; # This tests properties of dual-life modules: # # * Are all dual-life programs being generated in utils/? +# ... or in the module-specific locations where they are built. chdir 't'; require './test.pl'; @@ -36,33 +37,38 @@ $dist_dir_exe{lc "podchecker.PL"} = "../cpan/Pod-Checker/podchecker"; $dist_dir_exe{lc "pod2usage.PL"} = "../cpan/Pod-Usage/pod2usage"; foreach (qw (pod2man pod2text)) { - $dist_dir_exe{lc "$_.PL"} = "../cpan/podlators/$_"; + $dist_dir_exe{lc "$_.PL"} = "../cpan/podlators/scripts/$_"; + # redundant but necessary given use of scripts/ for both + # built version and .PL. + $dist_dir_exe{lc $_} = "../cpan/podlators/scripts/$_"; }; $dist_dir_exe{'pod2html.pl'} = '../ext/Pod-Html'; my @programs; +my $ext = $^O eq 'VMS' ? '.com' : ''; + find( { no_chdir => 1, wanted => sub { my $name = $File::Find::name; return if $name =~ /blib/; return unless $name =~ m{/(?:bin|scripts?)/\S+\z} && $name !~ m{/t/}; + $name =~ s/${ext}\z//; push @programs, $name; }}, qw( ../cpan ../dist ../ext ), ); -my $ext = $^O eq 'VMS' ? '.com' : ''; for my $f ( @programs ) { $f =~ s/\.\z// if $^O eq 'VMS'; next if $f =~ $not_installed; my $bn = basename($f); if(grep { /\A(?i:$bn)\z/ } keys %dist_dir_exe) { - ok( -f "$dist_dir_exe{lc $bn}$ext", "$f$ext"); + ok( -f "$dist_dir_exe{lc $bn}$ext", $f); } else { - ok( -f catfile('..', 'utils', "$bn$ext"), "$f$ext" ); + ok( -f catfile('..', 'utils', "$bn$ext"), $f ); } } |