#9: Fix for the 01_selftest.t failure

reneeb · Dec 11, 2018 · 8795804 · 8795804
1 parent 9b67be8
commit 8795804
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 7 deletions.
diff --git a/lib/Test/CheckManifest.pm b/lib/Test/CheckManifest.pm
@@ -247,14 +247,18 @@ sub _is_excluded{
     }
 
     my @matches = grep{ $file =~ /$_$/ }@excluded_files;
+
+    return 1 if @matches;
+
+    my $dirname = dirname $file;
 
     if($bool eq 'or'){
         push @matches, $file if grep{ref($_) and ref($_) eq 'Regexp' and $file =~ /$_/}@$filter;
-        push @matches, $file if grep{$file =~ /^\Q$_\E/}@$dirref;
+        push @matches, $file if grep{ $dirname eq $_ }@$dirref;
     }
     else{
         if(grep{$file =~ /$_/ and ref($_) and ref($_) eq 'Regexp'}@$filter and
-           grep{$file =~ /^\Q$_\E/ and not ref($_)}@$dirref){
+           grep{ $dirname eq $_ and not ref($_)}@$dirref){
             push @matches, $file;
         }
     }

diff --git a/t/00_load.t b/t/00_load.t
@@ -4,4 +4,4 @@ use strict;
 use warnings;
 use Test::More tests => 1;
 
-use_ok('Test::CheckManifest');
+use_ok('Test::CheckManifest');
diff --git a/t/01_selftest.t b/t/01_selftest.t
@@ -6,7 +6,7 @@ use File::Spec;
 use File::Basename;
 use Test::More;
 
-eval "use Test::CheckManifest tests => 9";
+eval "use Test::CheckManifest tests => 10";
 plan skip_all => "Test::CheckManifest required" if $@;
 
 #$Test::CheckManifest::VERBOSE = 0;
@@ -49,14 +49,24 @@ Test::CheckManifest::_not_ok_manifest({filter => [qr/\.git/], exclude => ['/.git
 Test::CheckManifest::_not_ok_manifest({filter  => [qr/\.git/],
                                        bool    => 'and',
                                        exclude => ['/t/test']}, 'filter AND exclude');
-ok_manifest({filter  => [qr/\.(git|build)/],
-             exclude => ['/t/test']}, 'filter OR exclude');
+
+Test::CheckManifest::_not_ok_manifest({
+    filter  => [qr/\.(git|build)/],
+    exclude => ['/t/test'],
+}, 'filter OR exclude - test.svn is missing');
+
+unlink $file2;
+
+ok_manifest({
+    filter  => [qr/\.(git|build)/],
+    exclude => ['/t/test'],
+}, 'filter OR exclude');
 
 unlink $file3;
 
 ok_manifest({filter => [qr/\.git/, qr/\.svn/, qr/\.build/ ]},'Filter \.git or \.svn');
 
-unlink $file2, $file1;
+unlink $file1;
 rmdir  $dir;
 rmdir  $dir2;
 

diff --git a/t/xt/02_issue1.t b/t/xt/02_issue1.t
@@ -11,3 +11,4 @@ use Cwd;
     ok_manifest({ filter => [ qr/\.(git|build)/, qr/Test-CheckManifest-/ ], dir => $dir });
 
 }
+
diff --git a/t/xt/03_issue7.t b/t/xt/03_issue7.t
@@ -32,3 +32,4 @@ SKIP: {
     }
 
 }
+