r53025 - /trunk/dh-make-perl/t/dists.t

[dmn at users.alioth.debian.org]

Author: dmn
Date: Thu Feb 18 17:49:32 2010
New Revision: 53025

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=53025
Log:
dists.t:compare(): generic variant support

Modified:
    trunk/dh-make-perl/t/dists.t

Modified: trunk/dh-make-perl/t/dists.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/t/dists.t?rev=53025&op=diff
==============================================================================
--- trunk/dh-make-perl/t/dists.t (original)
+++ trunk/dh-make-perl/t/dists.t Thu Feb 18 17:49:32 2010
@@ -9,13 +9,15 @@
 use File::Spec::Functions qw(splitpath);
 
 sub compare {
-    my ( $dist, $path, $refresh ) = @_;
+    my ( $dist, $path, $variant ) = @_;
     my ( $vol, $dir, $name ) = splitpath($path);
 
     return unless -f $path;
 
+    $variant //= '';
+
     my $real = $path;
-    $path =~ s{/wanted-debian/}{/wanted-debian--refresh/} if $refresh;
+    $path =~ s{/wanted-debian/}{/wanted-debian$variant/};
     $real =~ s{/wanted-debian/}{/debian/};
     my $diff = diff($path, $real);
 
@@ -50,7 +52,7 @@
     }
 
     is( $diff, '',
-        "$dist/debian/$name is OK" . ( $refresh ? " after --refresh" : '' ) );
+        "$dist/debian/$name is OK" . ( $variant ? " ($variant)" : '' ) );
 }
 
 sub dist_ok($) {
@@ -93,7 +95,7 @@
 
     is( $?, 0, "$dist_dir --refresh: system returned 0" );
 
-    compare( $dist_dir, $_, 1) for @files;
+    compare( $dist_dir, $_, '--refresh') for @files;
 
     # clean after the test
     File::Find::Rule->file