[libtest-checkmanifest-perl] 03/07: Refresh fix-tests.patch.
gregor herrmann
gregoa at debian.org
Sun Apr 6 17:55:21 UTC 2014
This is an automated email from the git hooks/post-receive script.
gregoa pushed a commit to branch master
in repository libtest-checkmanifest-perl.
commit 51fa7912f8809436cb3eb624a8c5a8dc44794d68
Author: gregor herrmann <gregoa at debian.org>
Date: Sun Apr 6 19:52:17 2014 +0200
Refresh fix-tests.patch.
---
debian/patches/fix-tests.patch | 36 ++++++++++++++++++++++--------------
1 file changed, 22 insertions(+), 14 deletions(-)
diff --git a/debian/patches/fix-tests.patch b/debian/patches/fix-tests.patch
index 54dc78c..3fb840d 100644
--- a/debian/patches/fix-tests.patch
+++ b/debian/patches/fix-tests.patch
@@ -1,34 +1,32 @@
Description: added .pc and debian to exclude/filter clauses
Origin: vendor
-Forwarded: no
+Forwarded: not-needed
Author: Nicholas Bamber <nicholas at periapt.co.uk>
-Reviewed-by: Alessandro Ghedini <ghedo at debian.org>
-Last-Update: 2012-07-26
+Reviewed-by: Alessandro Ghedini <ghedo at debian.org>, gregor herrmann <gregoa at debian.org>
+Last-Update: 2014-04-06
--- a/t/01_selftest.t
+++ b/t/01_selftest.t
-@@ -33,7 +33,7 @@
+@@ -35,7 +35,7 @@
open $fh ,'>',$file2 and close $fh;
Test::CheckManifest::_not_ok_manifest('expected: Manifest not ok');
--ok_manifest({filter => [qr/\.(?:svn|git)/]},'Filter: \.(?:svn|git)');
-+ok_manifest({filter => [qr/\.(?:svn|git|pc)/,qr/debian/]},'Filter: \.(?:svn|git)');
+-ok_manifest({filter => [qr/\.(?:svn|git|build)/]},'Filter: \.(?:svn|git|build)');
++ok_manifest({filter => [qr/\.(?:svn|git|build)/, qr/debian/, qr/\.pc/]},'Filter: \.(?:svn|git|build)');
Test::CheckManifest::_not_ok_manifest({exclude => ['/.git/']},'expected: Manifest not ok (Exclude /.git/)');
mkdir $dir2;
-@@ -44,12 +44,12 @@
- Test::CheckManifest::_not_ok_manifest({filter => [qr/\.git/],
+@@ -47,11 +47,11 @@
bool => 'and',
exclude => ['/t/test']}, 'filter AND exclude');
--ok_manifest({filter => [qr/\.git/],
+ ok_manifest({filter => [qr/\.(git|build)/],
- exclude => ['/t/test']}, 'filter OR exclude');
-+ok_manifest({filter => [qr/\.(?:git|svn)/],
+ exclude => ['/t/test','/debian','/.pc']}, 'filter OR exclude');
unlink $file3;
--ok_manifest({filter => [qr/\.git/, qr/\.svn/ ]},'Filter \.git or \.svn');
-+ok_manifest({filter => [qr/\.git/, qr/\.svn/, qr/\.pc/, qr/debian/ ]},'Filter \.git or \.svn');
+-ok_manifest({filter => [qr/\.git/, qr/\.svn/, qr/\.build/ ]},'Filter \.git or \.svn');
++ok_manifest({filter => [qr/\.git/, qr/\.svn/, qr/\.build/, qr/\.pc/, qr/debian/]},'Filter \.git or \.svn');
unlink $file2, $file1;
rmdir $dir;
@@ -38,7 +36,17 @@ Last-Update: 2012-07-26
eval "use Test::CheckManifest tests => 1";
plan skip_all => "Test::CheckManifest required" if $@;
--ok_manifest({filter => [qr/\.(?:svn|git)/]},'Filter: \.(?:svn|git)');
-+ok_manifest({filter => [qr/\.git/, qr/\.svn/, qr/\.pc/, qr/debian/ ]},'Filter \.git or \.svn');
+-ok_manifest({filter => [qr/\.(?:svn|git|build)/]},'Filter: \.(?:svn|git)');
++ok_manifest({filter => [qr/\.(?:svn|git|build)/, qr/\.pc/, qr/debian/]},'Filter: \.(?:svn|git)');
+--- a/t/xt/02_issue1.t
++++ b/t/xt/02_issue1.t
+@@ -8,6 +8,6 @@
+
+ {
+ my $dir = Cwd::getcwd();
+- ok_manifest({ filter => [ qr/\.(git|build)/, qr/Test-CheckManifest-/ ], dir => $dir });
++ ok_manifest({ filter => [ qr/\.(git|build)/, qr/Test-CheckManifest-/, qr/debian/, qr/\.pc/ ], dir => $dir });
+
+ }
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libtest-checkmanifest-perl.git
More information about the Pkg-perl-cvs-commits
mailing list