[SCM] Debian package checker branch, master, updated. 2.4.2-35-g25219ae
The following commit has been merged in the master branch:
commit 739c33030997dc43cea98bb7206cb2c9eb453a7c
Author: Russ Allbery <rra@debian.org>
Date: Sun Jul 25 18:52:30 2010 -0700
Add support for skipping raw and source package tests
* t/runtests:
+ [RA] Add support for skipping raw Debian package and source package
tests.
diff --git a/debian/changelog b/debian/changelog
index 9d65559..fe941bc 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -70,6 +70,10 @@ lintian (2.4.3) UNRELEASED; urgency=low
description. This was failing with an error later, and the tag was
probably removed from Lintian and is now erroneous.
+ * t/runtests:
+ + [RA] Add support for skipping raw Debian package and source package
+ tests.
+
-- Raphael Geissert <geissert@debian.org> Fri, 02 Jul 2010 15:22:17 -0500
lintian (2.4.2) unstable; urgency=low
diff --git a/t/debs/README b/t/debs/README
index f37e526..6e667c0 100644
--- a/t/debs/README
+++ b/t/debs/README
@@ -39,6 +39,14 @@ need to worry about file ownership when creating the files as long
as all files included in the archive are newly created or chowned
before creating the deb.
+Skipping tests
+--------------
+
+To mark a test to be skipped, create a file named "skip" in the test
+directory containing the reason for why this test should be skipped.
+This should be used for tests for work that hasn't been finished or
+tests that must be temporarily skipped due to bugs in other packages.
+
TEST NAMING CONVENTIONS
=======================
diff --git a/t/runtests b/t/runtests
index 03187cc..ba60dda 100755
--- a/t/runtests
+++ b/t/runtests
@@ -626,6 +626,10 @@ sub test_deb {
my $testdir = "$TESTSET/debs/$test";
my $targetdir = "$RUNDIR/$test";
+ if (-f "$testdir/skip") {
+ print "skipped.\n";
+ return 1;
+ }
print "Cleaning up and repopulating $targetdir...\n" if $DEBUG;
runsystem_ok("rm", "-rf", $targetdir);
@@ -686,6 +690,10 @@ sub test_source {
my $testdir = "$TESTSET/source/$test";
my $targetdir = "$RUNDIR/$test";
+ if (-f "$testdir/skip") {
+ print "skipped.\n";
+ return 1;
+ }
print "Cleaning up and repopulating $targetdir...\n" if $DEBUG;
runsystem_ok("rm", "-rf", $targetdir);
diff --git a/t/source/README b/t/source/README
index c075631..54df98b 100644
--- a/t/source/README
+++ b/t/source/README
@@ -35,6 +35,14 @@ file, such as running dpkg-source.
The Makefile does not have to clean up after itself. It can assume
that the directory is deleted and recreated between test runs.
+Skipping tests
+--------------
+
+To mark a test to be skipped, create a file named "skip" in the test
+directory containing the reason for why this test should be skipped.
+This should be used for tests for work that hasn't been finished or
+tests that must be temporarily skipped due to bugs in other packages.
+
TEST NAMING CONVENTIONS
=======================
--
Debian package checker
Reply to: