[SCM] Debian package checker branch, master, updated. 2.2.18-5-g9518612

["Russ Allbery" <rra@debian.org>]

The following commit has been merged in the master branch:
commit ce67c3d95c809c153395b7739ac566e8b3a43eee
Author: Russ Allbery <rra@debian.org>
Date:   Sun Dec 20 13:54:42 2009 -0800

    Allow better testing of Lintian options
    
    * t/runtests:
      + [RA] Unwrap the Options field so that it can be continued.
      + [RA] Replace TESTSET in Options with the root of the test suite so
        that Lintian options referring to files can be tested with files in
        the test suite directory.

diff --git a/debian/changelog b/debian/changelog
index 0e8b555..8ddc842 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,12 @@ lintian (2.2.19) UNRELEASED; urgency=low
       all of the descriptive text is included.  Thanks, Jonathan Wiltshire.
       (Closes: #557786)
 
+  * t/runtests:
+    + [RA] Unwrap the Options field so that it can be continued.
+    + [RA] Replace TESTSET in Options with the root of the test suite so
+      that Lintian options referring to files can be tested with files in
+      the test suite directory.
+
  -- Russ Allbery <rra@debian.org>  Mon, 23 Nov 2009 02:20:29 -0800
 
 lintian (2.2.18) unstable; urgency=low
diff --git a/t/runtests b/t/runtests
index bf650a2..7d9c709 100755
--- a/t/runtests
+++ b/t/runtests
@@ -699,6 +699,12 @@ sub check_test_is_sane {
     $data->{skeleton} ||= 'skel';
     $data->{options} ||= '-I -E';
 
+    # Unwrap the options in case we used continuation lines.
+    $data->{options} =~ s/\n//g;
+
+    # Allow options relative to the root of the test directory.
+    $data->{options} =~ s/TESTSET/$dir/g;
+
     if ($DEBUG) {
 	print "check_test_is_sane => ".Dumper($data);
     }
diff --git a/t/tests/README b/t/tests/README
index f49187f..8c67603 100644
--- a/t/tests/README
+++ b/t/tests/README
@@ -69,6 +69,11 @@ For example, to test --show-overrides with the -T option, use:
 
     Options: --show-overrides -T no-copyright-file
 
+The string TESTSET in the Options field will be replaced with the root of
+the test suite (the whole test suite, not the test currently running) so
+that the Lintian options can refer to files in the test suite directory to
+test options like --suppress-tags-from-file.
+
 By default, all tests are built as native Debian packages.  To build
 the test case as a non-native package, add:
 

-- 
Debian package checker