[SCM] Debian package checker branch, master, updated. 2.5.2-31-g6c3a5ee

["Niels Thykier" <niels@thykier.net>]

The following commit has been merged in the master branch:
commit b4e91c5a41e1a7853644410a549e1c9d001bde8a
Author: Niels Thykier <niels@thykier.net>
Date:   Wed Aug 17 21:59:53 2011 +0200

    Extended the changes-file tests

diff --git a/t/COVERAGE b/t/COVERAGE
index 2cb88b0..7ab6c53 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -1,5 +1,5 @@
-Last generated 2011-08-16
-Coverage: 690/915 (75.41%), w. legacy tests: 815/915 (89.07%)
+Last generated 2011-08-17
+Coverage: 692/915 (75.63%), w. legacy tests: 817/915 (89.29%)
 
 The following tags are not tested by the test suite:
 
@@ -15,8 +15,6 @@ changelog-file wrong-name-for-debian-changelog-file
 changelog-file wrong-name-for-upstream-changelog
 
 changes-file bad-section-in-changes-file
-changes-file checksum-mismatch-in-changes-file
-changes-file file-size-mismatch-in-changes-file
 
 cruft source-contains-prebuilt-windows-binary
 
diff --git a/t/changes/changes-file-size-checksum-mismatch.changes.in b/t/changes/changes-file-size-checksum-mismatch.changes.in
new file mode 100644
index 0000000..652bc4c
--- /dev/null
+++ b/t/changes/changes-file-size-checksum-mismatch.changes.in
@@ -0,0 +1,18 @@
+Format: 1.8
+Date: {$date}
+Source: {$srcpkg}
+Binary: {$srcpkg}
+Architecture: source all
+Version: {$version}
+Distribution: unstable
+Urgency: low
+Maintainer: {$author}
+Changed-By: {$author}
+Files:
+ d41d8cd98f00b204e9800998ecf8427e 0 devel optional changes-file-size-checksum-mismatch.log
+Checksums-Sha1:
+ da39a3ee5e6b4b0d3255bfef95601890afd80709 0 changes-file-size-checksum-mismatch.log
+Checksums-Sha256:
+ e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 0 changes-file-size-checksum-mismatch.log
+Description:
+ {$srcpkg} - {$description}
diff --git a/t/changes/changes-file-size-checksum-mismatch.desc b/t/changes/changes-file-size-checksum-mismatch.desc
new file mode 100644
index 0000000..f519efe
--- /dev/null
+++ b/t/changes/changes-file-size-checksum-mismatch.desc
@@ -0,0 +1,7 @@
+Testname: changes-file-size-checksum-mismatch
+Sequence: 6000
+Version: 1.0
+Description: Test for file size and checksums check
+Test-For:
+ checksum-mismatch-in-changes-file
+ file-size-mismatch-in-changes-file
diff --git a/t/tests/changelog-file-missing/upstream/README b/t/changes/changes-file-size-checksum-mismatch.log
similarity index 100%
copy from t/tests/changelog-file-missing/upstream/README
copy to t/changes/changes-file-size-checksum-mismatch.log
diff --git a/t/changes/changes-file-size-checksum-mismatch.tags b/t/changes/changes-file-size-checksum-mismatch.tags
new file mode 100644
index 0000000..cb2c903
--- /dev/null
+++ b/t/changes/changes-file-size-checksum-mismatch.tags
@@ -0,0 +1,4 @@
+E: changes-file-size-checksum-mismatch changes: checksum-mismatch-in-changes-file md5 changes-file-size-checksum-mismatch.log
+E: changes-file-size-checksum-mismatch changes: checksum-mismatch-in-changes-file sha1 changes-file-size-checksum-mismatch.log
+E: changes-file-size-checksum-mismatch changes: checksum-mismatch-in-changes-file sha256 changes-file-size-checksum-mismatch.log
+E: changes-file-size-checksum-mismatch changes: file-size-mismatch-in-changes-file changes-file-size-checksum-mismatch.log 0 != 12
diff --git a/t/runtests b/t/runtests
index d595b45..c546e5f 100755
--- a/t/runtests
+++ b/t/runtests
@@ -480,9 +480,15 @@ sub test_changes {
     my $test = $testdata->{srcpkg};
     my $testdir = "$TESTSET/changes";
     my $file = "$testdir/$test.changes";
+    # Check if we need to copy these files over.
     if ( ! -e $file && -e "$file.in" ) {
+	my @files;
 	msg_print "building... ";
-	runsystem('cp', '-f', "${file}.in", "$RUNDIR/${test}.changes.in");
+	# copy all files but "tags" and desc.  Usually this will only
+	# be ".changes.in", but in rare cases we have "other files"
+	# as well.
+	@files = grep { !/\.(?:desc|tags)$/o } glob "$testdir/$test.*";
+	runsystem('cp', '-f', @files, "$RUNDIR/");
 	$file = "$RUNDIR/${test}.changes";
 	fill_in_tmpl($file, $testdata);
     }

-- 
Debian package checker