r72018 - in /trunk/libtest-checkmanifest-perl/debian: changelog patches/fix-tests patches/fix-tests.patch patches/series

[periapt-guest at users.alioth.debian.org]

Author: periapt-guest
Date: Mon Mar 28 21:25:09 2011
New Revision: 72018

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=72018
Log:
Rewrote tests patch to be more robust

Added:
    trunk/libtest-checkmanifest-perl/debian/patches/fix-tests.patch
      - copied, changed from r72013, trunk/libtest-checkmanifest-perl/debian/patches/fix-tests
Removed:
    trunk/libtest-checkmanifest-perl/debian/patches/fix-tests
Modified:
    trunk/libtest-checkmanifest-perl/debian/changelog
    trunk/libtest-checkmanifest-perl/debian/patches/series

Modified: trunk/libtest-checkmanifest-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-checkmanifest-perl/debian/changelog?rev=72018&op=diff
==============================================================================
--- trunk/libtest-checkmanifest-perl/debian/changelog (original)
+++ trunk/libtest-checkmanifest-perl/debian/changelog Mon Mar 28 21:25:09 2011
@@ -1,10 +1,4 @@
 libtest-checkmanifest-perl (1.23-1) UNRELEASED; urgency=low
-
-  TODO: The test t/01_selftest.t is hopelessly fragile.
-  It depends on the abscence of .svn and existence of .pc files.
-  Thus it will fail or succeed depending upon which *-buildpackge
-  variant is used and will also require tweaking on account
-  of Debian only patches.
 
   [ Ansgar Burchardt ]
   * Email change: Ansgar Burchardt -> ansgar at debian.org
@@ -13,7 +7,7 @@
   * Added myself to Uploaders
   * New upstream release
   * Updated copyright
-  * Refreshed patch
+  * Rewrote tests patch to be more robust
   * Added patch for mangled POD
 
  -- Nicholas Bamber <nicholas at periapt.co.uk>  Mon, 28 Mar 2011 16:54:18 +0100

Copied: trunk/libtest-checkmanifest-perl/debian/patches/fix-tests.patch (from r72013, trunk/libtest-checkmanifest-perl/debian/patches/fix-tests)
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-checkmanifest-perl/debian/patches/fix-tests.patch?rev=72018&op=diff
==============================================================================
--- trunk/libtest-checkmanifest-perl/debian/patches/fix-tests (original)
+++ trunk/libtest-checkmanifest-perl/debian/patches/fix-tests.patch Mon Mar 28 21:25:09 2011
@@ -1,26 +1,32 @@
-Description: add debian/ files to MANIFEST to ensure tests pass
-Author: Ryan Niebur <ryan at debian.org>
+Description: added .pc and debian to exclude/filter clauses
+Author: Nicholas Bamber <nicholas at periapt.co.uk>
 Origin: vendor
 Forwarded: no
---- a/MANIFEST
-+++ b/MANIFEST
-@@ -14,3 +14,19 @@
- lib/Test/CheckManifest.pm
+Last-Update: 2011-03-28
+--- a/t/01_selftest.t
++++ b/t/01_selftest.t
+@@ -33,7 +33,7 @@
+ open $fh ,'>',$file2 and close $fh;
  
- META.yml
-+debian/changelog
-+debian/rules
-+debian/watch
-+debian/libtest-checkmanifest-perl.debhelper.log
-+debian/copyright
-+debian/compat
-+debian/control
-+debian/patches/series
-+debian/patches/fix-tests
-+debian/source/format
-+.pc/.version
-+.pc/applied-patches
-+.pc/fix-tests/MANIFEST
-+.pc/pod.patch/lib/Test/CheckManifest.pm
-+.pc/.quilt_patches
-+.pc/.quilt_series
+ 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)');
+ 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/],
+                                        bool    => 'and',
+                                        exclude => ['/t/test']}, 'filter AND exclude');
+-ok_manifest({filter  => [qr/\.git/],
+-             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');
+ 
+ unlink $file2, $file1;
+ rmdir  $dir;

Modified: trunk/libtest-checkmanifest-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-checkmanifest-perl/debian/patches/series?rev=72018&op=diff
==============================================================================
--- trunk/libtest-checkmanifest-perl/debian/patches/series (original)
+++ trunk/libtest-checkmanifest-perl/debian/patches/series Mon Mar 28 21:25:09 2011
@@ -1,2 +1,2 @@
-fix-tests
+fix-tests.patch
 pod.patch