[SCM] Debian package checker branch, master, updated. 1.24.4-116-g35bb1ea

["Frank Lichtenheld" <djpig@debian.org>]

The following commit has been merged in the master branch:
commit da369f55cf1416486db4c137addd781532040443
Author: Frank Lichtenheld <djpig@debian.org>
Date:   Sat Sep 13 00:11:19 2008 +0200

    t/runtests: Remove global tests that were duplicated from testset/runtests
    
    No need to run them twice.

diff --git a/debian/changelog b/debian/changelog
index 368123f..e1a7c80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -124,6 +124,8 @@ lintian (2.0.0~rc1) experimental; urgency=low
   
   * t/runtests:
     + [FL] Copy the changes to testset/runtests from JP's branch.
+    + [FL] Remove global tests that were duplicated from testset/runtests,
+      which will not go away in the forseeable future.
     + [RA] Fix single test mode.
 
  -- Frank Lichtenheld <djpig@debian.org>  Sat, 23 Aug 2008 22:55:44 +0200
diff --git a/t/runtests b/t/runtests
index 24c9c5a..6e03822 100755
--- a/t/runtests
+++ b/t/runtests
@@ -127,102 +127,6 @@ $| = 1;
 -d $rundir
     or fail("test directory $rundir does not exist\n");
 
-# does every tag have an info section?
-print "Checking for missing info tags ... ";
-
-$testok = 1;
-for my $desc_file (<$LINTIAN_ROOT/checks/*.desc>) {
-    for my $i (read_dpkg_control($desc_file)) {
-	$desc_file =~ s#.*/##;
-	if (exists $i->{'tag'}) {
-	    if ($i->{'tag'} !~ /^[\w0-9.+-]+$/) {
-		print "E: test-tag-has-invalid-characters $i->{'tag'}"
-		    . " in $desc_file\n";
-	    }
-	    if (not exists $i->{'info'}) {
-		print "E: test-has-no-info $i->{'tag'} in $desc_file\n";
-		$testok = 0;
-	    }
-
-	    # Check the tag info for unescaped <> or for unknown tags (which
-	    # probably indicate the same thing).
-	    my $info = $i->{'info'};
-	    my @tags;
-	    while ($info =~ s,<([^\s>]+)(?:\s+href=\"[^\"]+\")?>.*?</\1>,,s) {
-		push (@tags, $1);
-	    }
-	    my %known = map { $_ => 1 } qw(a em i tt);
-            my %seen;
-	    @tags = grep { !$known{$_} && !$seen{$_}++ } @tags;
-	    if (@tags) {
-		print "E: test-info-has-unknown-html-tags $i->{'tag'} @tags"
-		    . " in $desc_file\n";
-	    }
-	    if ($info =~ /[<>]/) {
-		print "E: test-info-has-stray-angle-brackets $i->{'tag'}"
-		    . " in $desc_file\n";
-	    }
-
-	    my $severity = $i->{'severity'};
-	    my $certainty = $i->{'certainty'};
-	    if ($severity and not exists $severities{$severity}) {
-		print "E: test-invalid-severity $severity in $desc_file\n";
-		$testok = 0;
-		next;
-	    }
-	    if ($certainty and not exists $certainties{$certainty}) {
-		print "E: test-invalid-certainty $certainty in $desc_file\n";
-		$testok = 0;
-		next;
-	    }
-	    if (not $severity or not $certainty) {
-		print "E: test-unclassified-tag $i->{'tag'} in $desc_file\n";
-		$testok = 0;
-		next;
-	    }
-
-	    my $experimental = $i->{'experimental'};
-	    my $code = Tags::get_tag_code($i);
-	    $code = 'X' if $experimental and $experimental eq 'yes';
-
-	    $tags{$i->{'tag'}}{'desc_file'} = $desc_file;
-	    $tags{$i->{'tag'}}{'desc_type'} = $code;
-	}
-    }
-}
-
-if ($testok) {
-    print "done.\n";
-} else {
-    print "FAILED!\n";
-    exit 1 unless $run_all_tests;
-}
-
-# can I make a lab?
-print "Running static lab test ... create ... ";
-$testok = runsystem_ok("$lintian_path --lab $rundir/test_lab --setup-lab");
-# can I renew a lab?
-print " renew ... ";
-$testok = runsystem_ok("$lintian_path --lab $rundir/test_lab --setup-lab")
-    if $testok;
-# can I remove a lab?
-print " remove ...";
-$testok = runsystem_ok("$lintian_path --lab $rundir/test_lab --remove-lab")
-    if $testok;
-# should be empty now
-print " rmdir ...";
-$testok = runsystem_ok("rmdir $rundir/test_lab")
-    if $testok;
-# cleanup
-runsystem("rm -r $rundir/test_lab") if -d "$rundir/test_lab";
-if ($testok) {
-    print "done.\n";
-} else {
-    print "FAILED!\n";
-    exit 1 unless $run_all_tests;
-}
-
-# ok, I can make a static lab, now let's test the package checks
 # in temporary labs
 my @tests;
 if ($singletest) {
@@ -320,30 +224,6 @@ for (@tests) {
      close TAGS;
 }
 
-print "Checking whether all tags are tested and tags have description ... \n";
-$testok = 1;
-for (keys %tags) {
-    my $values = $tags{$_};
-    if (not defined $values->{'desc_type'}) {
-	print "E: tag-has-no-description $_ in $values->{'tested_package'}\n";
-	$testok = 0;
-    } elsif (not defined $values->{'tested_type'}) {
-	print "I: tag-is-not-tested $_ in $values->{'desc_file'}\n"
-	    if $verbose;
-    } elsif ($values->{'desc_type'} ne $values->{'tested_type'}) {
-	print "E: tag-has-inconsistent-type $_ $values->{'tested_type'} vs ".
-	    "$values->{'desc_type'}\n";
-	$testok = 0;
-    }
-}
-
-if ($testok) {
-    print "done.\n";
-} else {
-    print "FAILED\n";
-    exit 1 unless $run_all_tests;
-}
-
 # --------------
 sub runsystem {
     print "runsystem(@_)\n" if $debug;

-- 
Debian package checker