[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[lintian] 06/07: unpack-level.t: Track only the "special" unpack files



This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository lintian.

commit 8f994d1f1af7e2dc5a66bdbcc3214291dd66a144
Author: Niels Thykier <niels@thykier.net>
Date:   Sat Sep 27 12:36:59 2014 +0200

    unpack-level.t: Track only the "special" unpack files
    
    The needs-info-missing.t test does a better job at figuring out if a
    check needs "unpacked" due to how it uses $info.  Therefore,
    unpack-level.t is now reduced to just tracking the "error" files
    created by unpacked.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>
---
 t/scripts/unpack-level.t | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/t/scripts/unpack-level.t b/t/scripts/unpack-level.t
index 6129981..95955f4 100755
--- a/t/scripts/unpack-level.t
+++ b/t/scripts/unpack-level.t
@@ -33,12 +33,7 @@ our @DESCS = (
     glob("$ENV{LINTIAN_TEST_ROOT}/checks/*.desc"));
 plan tests => scalar(@DESCS);
 
-my @l2refs = (
-    qr|->unpacked|,qr<unpacked/>,
-    qr<unpacked-errors>,qr|->index|,
-    qr|->sorted_index|,qr<index-errors>,
-    qr<chdir\s*\(?\s*["'](?:\$dir/)?unpacked/?['"]\s*\)?>,
-);
+my @l2refs = (qr<unpacked-errors>,qr<index-errors>,);
 
 # For each desc file, load the first stanza of the file and check that if
 # the unpack level is one no reference to unpack/ should be made, and if
@@ -80,9 +75,7 @@ for my $desc (@DESCS) {
     $requires_unpacked = 0 if ($short eq 'collection/unpacked.desc');
 
     ok(
-        $requires_unpacked
-        ? defined($ninfo{'unpacked'})
-        : !defined($ninfo{'unpacked'}),
+        !$requires_unpacked|| defined($ninfo{'unpacked'}),
         "$short has valid needs-info for unpack level"
     );
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git


Reply to: