[SCM] Debian package checker branch, master, updated. 2.4.3-64-g9b861d0

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

The following commit has been merged in the master branch:
commit 9b861d0a4eb4ffa607d968158caa59c51595ffdf
Author: Niels Thykier <niels@thykier.net>
Date:   Tue Dec 28 20:01:38 2010 +0100

    Pass --allow-root during testing to avoid auto-fails, if the test
    is run as root.

diff --git a/t/runtests b/t/runtests
index 217d229..86b7d46 100755
--- a/t/runtests
+++ b/t/runtests
@@ -455,6 +455,7 @@ sub test_package {
     print "testing... ";
     my $opts = { err => "$RUNDIR/tags.$pkg", fail => 'never' };
     my $status;
+    unshift(@options, '--allow-root');
     if ($testdata->{sort}) {
 	$status = spawn($opts, [ $LINTIAN, @options, $file ], '|', [ 'sort' ]);
     } else {
@@ -574,7 +575,7 @@ sub test_changes {
     my $testdir = "$TESTSET/changes";
 
     print "testing... ";
-    runsystem_ok("$LINTIAN -I -E $testdir/$test.changes 2>&1"
+    runsystem_ok("$LINTIAN --allow-root -I -E $testdir/$test.changes 2>&1"
 		 . " | sort > $RUNDIR/tags.changes-$test");
 
     # Compare the output to the expected tags.
@@ -639,7 +640,7 @@ sub test_deb {
     runsystem("cd $targetdir && fakeroot make >../build.$test 2>&1");
 
     print "testing... ";
-    runsystem_ok("$LINTIAN -I -E $targetdir/$test.deb 2>&1"
+    runsystem_ok("$LINTIAN --allow-root -I -E $targetdir/$test.deb 2>&1"
 		 . " | sort > $RUNDIR/tags.$test");
 
     # Compare the output to the expected tags.
@@ -703,7 +704,7 @@ sub test_source {
     runsystem("cd $targetdir && make >../build.$test 2>&1");
 
     print "testing... ";
-    runsystem_ok("$LINTIAN -I -E $targetdir/*.dsc 2>&1"
+    runsystem_ok("$LINTIAN --allow-root -I -E $targetdir/*.dsc 2>&1"
 		 . " | sort > $RUNDIR/tags.$test");
 
     # Compare the output to the expected tags.
diff --git a/t/scripts/static-lab.t b/t/scripts/static-lab.t
index 489ba73..190cc2f 100755
--- a/t/scripts/static-lab.t
+++ b/t/scripts/static-lab.t
@@ -8,7 +8,7 @@ use Test::Simple tests => 4;
 my $lintian_path = "$ENV{LINTIAN_ROOT}/frontend/lintian";
 my $labdir = tempdir(CLEANUP => 1);
 
-ok(system("$lintian_path --lab $labdir --setup-lab") == 0, "Create");
-ok(system("$lintian_path --lab $labdir --setup-lab") == 0, "Renew");
-ok(system("$lintian_path --lab $labdir --remove-lab") == 0, "Remove");
+ok(system("$lintian_path --allow-root --lab $labdir --setup-lab") == 0, "Create");
+ok(system("$lintian_path --allow-root --lab $labdir --setup-lab") == 0, "Renew");
+ok(system("$lintian_path --allow-root --lab $labdir --remove-lab") == 0, "Remove");
 ok(system("rmdir $labdir") == 0, "Rmdir");
diff --git a/testset/runtests b/testset/runtests
index d70345d..9402746 100755
--- a/testset/runtests
+++ b/testset/runtests
@@ -207,8 +207,8 @@ for (@tests) {
     runsystem("cd $rundir/$pkgdir && dpkg-buildpackage $dpkg_buildpackage_options >../build.$pkg 2>&1");
 
     print "testing... ";
-    print "Running lintian $lintian_options on $rundir/$pkg\_$ver*.changes...\n" if $debug;
-    runsystem_ok("$lintian_path $lintian_options $rundir/$pkg\_$ver*.changes".
+    print "Running lintian --allow-root $lintian_options on $rundir/$pkg\_$ver*.changes...\n" if $debug;
+    runsystem_ok("$lintian_path --allow-root $lintian_options $rundir/$pkg\_$ver*.changes".
     	" 2>&1 | sort > $rundir/tags.$pkg");
 
     # Run a sed-script if it exists, for tests that have slightly variable

-- 
Debian package checker