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

[SCM] Debian package checker branch, master, updated. 2.5.3-26-g7700fd2



The following commit has been merged in the master branch:
commit 7700fd29d1797763887a0d0eb0b8de19f93ae874
Author: Niels Thykier <niels@thykier.net>
Date:   Sat Sep 24 23:50:43 2011 +0200

    Skip tests that are broken due to the new dpkg
    
    cruft-general-wig-pen appears to be affected by #642656.
    fields-version-bad fails since dpkg no longer accepts non-numeric
    (upstream?) versions.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/t/runtests b/t/runtests
index 0dc9ed6..f3ffccd 100755
--- a/t/runtests
+++ b/t/runtests
@@ -372,6 +372,11 @@ sub test_package {
     my $is_native = ($testdata->{type} eq 'native');
     my $orig_version = $testdata->{version};
 
+    if (-f "$origdir/skip") {
+	msg_print "skipped.\n";
+	return 1;
+    }
+
     # Strip the Debian revision off of the name of the target directory and
     # the *.orig.tar.gz file if the package is non-native.  Otherwise, it
     # confuses dpkg-source, which then fails to find the upstream tarball and
diff --git a/t/tests/cruft-general-wig-pen/skip b/t/tests/cruft-general-wig-pen/skip
new file mode 100644
index 0000000..68cfed8
--- /dev/null
+++ b/t/tests/cruft-general-wig-pen/skip
@@ -0,0 +1 @@
+See #642656
diff --git a/t/tests/fields-version-bad/skip b/t/tests/fields-version-bad/skip
new file mode 100644
index 0000000..d190d68
--- /dev/null
+++ b/t/tests/fields-version-bad/skip
@@ -0,0 +1 @@
+dpkg does not accept non-numeric upstream versions anymore

-- 
Debian package checker


Reply to: