diff options
author | Father Chrysostomos <sprout@cpan.org> | 2011-10-02 17:56:51 -0700 |
---|---|---|
committer | Father Chrysostomos <sprout@cpan.org> | 2011-10-02 17:56:51 -0700 |
commit | 7af59249b7e61c7541bc2029d6fb68ea04d21221 (patch) | |
tree | de2ec49a667213c032a3c551328cbf68814b7498 /t | |
parent | b4836ccaabc8f18e6b9a5efa35a04f9591830bf0 (diff) | |
download | perl-7af59249b7e61c7541bc2029d6fb68ea04d21221.tar.gz |
Add another exception to dual-life.t
Module::Build’s tests create a file named something like
cpan/Module-Build/MB-rrWnCs8O/Simple/bin/foo.PL
during testing, causing dual-life.t to fail when testing in
parallel.
This commit adds that to the list of exceptions, but since the
exact name can vary, it changes the exception list into a
regular expression.
Diffstat (limited to 't')
-rw-r--r-- | t/porting/dual-life.t | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/t/porting/dual-life.t b/t/porting/dual-life.t index 90258aee67..f1a18a770c 100644 --- a/t/porting/dual-life.t +++ b/t/porting/dual-life.t @@ -14,14 +14,13 @@ use File::Basename; use File::Find; use File::Spec::Functions; -# Exceptions are found in dual-life bin dirs but aren't -# installed by default -my @not_installed = qw( - ../cpan/Encode/bin/ucm2table - ../cpan/Encode/bin/ucmlint - ../cpan/Encode/bin/ucmsort - ../cpan/Encode/bin/unidump -); +# Exceptions that are found in dual-life bin dirs but aren't +# installed by default; some occur only during testing: +my $not_installed = qr{^(?: + \.\./cpan/Encode/bin/u(?:cm(?:2table|lint|sort)|nidump) + | + \.\./cpan/Module-Build/MB-[\w\d]+/Simple/bin/foo\.PL +)\z}ix; my %dist_dir_exe; @@ -50,7 +49,7 @@ my $ext = $^O eq 'VMS' ? '.com' : ''; for my $f ( @programs ) { $f =~ s/\.\z// if $^O eq 'VMS'; - next if qr/(?i:$f)/ ~~ @not_installed; + next if $f =~ $not_installed; $f = basename($f); if(qr/\A(?i:$f)\z/ ~~ %dist_dir_exe) { ok( -f "$dist_dir_exe{lc $f}$ext", "$f$ext"); |