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

[SCM] Debian package checker branch, vendor-profile, updated. 2.5.1-25-gcff7c90



The following commit has been merged in the vendor-profile branch:
commit cff7c90caa53dd873d69dd946c0bb829cc065e3d
Author: Niels Thykier <niels@thykier.net>
Date:   Wed Jun 22 00:50:12 2011 +0200

    private/runtests: uses the debian profile by default
    
    The individual tests can overrule this by explicitly by using
    the (new) Profile field in their desc file.

diff --git a/private/runtests b/private/runtests
index 1bf4491..f6fe04b 100755
--- a/private/runtests
+++ b/private/runtests
@@ -18,6 +18,7 @@ fi
 LANG="en_US.UTF-8"
 LC_COLLATE="C"
 LINTIAN_ROOT=""
+LINTIAN_PROFILE=debian
 LINTIAN_INTERNAL_TESTSUITE=1
 LOCPATH="$(pwd)/debian/test.locale"
 NO_PKG_MANGLE=true
@@ -25,6 +26,7 @@ NO_PKG_MANGLE=true
 export LANG
 export LC_COLLCATE
 export LINTIAN_ROOT
+export LINTIAN_PROFILE
 export LINTIAN_INTERNAL_TESTSUITE
 export LOCPATH
 export NO_PKG_MANGLE
diff --git a/t/runtests b/t/runtests
index 22768dc..bc2b388 100755
--- a/t/runtests
+++ b/t/runtests
@@ -555,6 +555,7 @@ sub test_package {
     my $opts = { err => "$rundir/tags.$pkg", fail => 'never' };
     my $status;
     unshift(@options, '--allow-root', '--no-cfg');
+    unshift(@options, '--profile', $testdata->{profile}) if $testdata->{profile};
     if ($testdata->{sort}) {
 	$status = spawn($opts, [ $LINTIAN, @options, $file ], '|', [ 'sort' ]);
     } else {
diff --git a/t/tests/README b/t/tests/README
index 045e980..3668aaa 100644
--- a/t/tests/README
+++ b/t/tests/README
@@ -88,6 +88,13 @@ the test case as a non-native package, add:
 to the .desc file.  You will also want to change the version number to
 be non-native unless you're testing a mismatch.
 
+By default all tests are run with the default Lintian profile.  If a
+different profile is needed it can be specified via:
+
+    Profile: test/profile
+
+The value will be passed to Lintian via the --profile parameter.
+
 There are times when one wants to add a test for something that needs
 to be done.  To mark it as such, preventing the test suite from
 failing, use:
diff --git a/t/tests/lintian-ftp-rejects/desc b/t/tests/lintian-ftp-rejects/desc
index f369105..1e26f0d 100644
--- a/t/tests/lintian-ftp-rejects/desc
+++ b/t/tests/lintian-ftp-rejects/desc
@@ -1,6 +1,6 @@
 Testname: lintian-ftp-rejects
 Sequence: 2500
 Version: 1.0
-Options: -F
+Profile: debian/ftp-master-auto-reject
 Description: Test Lintian --ftp-master-rejects handling
 Test-For: dir-or-file-in-opt

-- 
Debian package checker


Reply to: