[SCM] Debian packaging of libdevice-cdio-perl branch, master, updated. upstream/0.3.0-69-gb8d3859

gregor herrmann gregoa at debian.org
Sat Jun 16 13:00:05 UTC 2012


The following commit has been merged in the master branch:
commit d4afe1a1a82cc262999743f86e3818c5ea4f0fca
Author: gregor herrmann <gregoa at debian.org>
Date:   Sat Jun 16 14:52:59 2012 +0200

    Add patch 05_tests-in-chroot.patch: skip tests that need a CDROM drive.

diff --git a/debian/patches/05_tests-in-chroot.patch b/debian/patches/05_tests-in-chroot.patch
new file mode 100644
index 0000000..02ff5e2
--- /dev/null
+++ b/debian/patches/05_tests-in-chroot.patch
@@ -0,0 +1,35 @@
+Description: skip tests that need a CDROM drive to enable building in a chroot
+Origin: vendor
+Forwarded: no
+Author: gregor herrmann <gregoa at debian.org>
+Last-Update: 2012-06-16
+
+--- a/t/05.ops.t
++++ b/t/05.ops.t
+@@ -14,6 +14,9 @@
+ use Test::More tests => 6;
+ note 'Test running miscellaneous operations';
+ 
++SKIP: {
++skip "No device '/dev/cdrom' found", 6 unless -e "/dev/cdrom";
++
+ my @drives = Device::Cdio::get_devices();
+ ok ( 1 , 'Device::Cdio::get_devices');
+ @drives = Device::Cdio::get_devices_with_cap($perlcdio::FS_MATCH_ALL);
+@@ -26,3 +29,5 @@
+ ok ( 1 , 'Device::Cdio::Device::have_ATAPI');
+ $dev->get_media_changed();
+ ok ( 1 , 'Device::Cdio::Device::get_media_changed');
++
++}
+--- a/t/11.dev.t
++++ b/t/11.dev.t
+@@ -16,6 +16,8 @@
+ #should be imported from Build.PL or ...
+ my $device = '/dev/cdrom';
+ 
++plan skip_all => "No device '$device' found" unless -e $device;
++
+ note 'Test running audio device operations';
+ 
+ my $dev = Device::Cdio::Device->new(-driver_id=>$perlcdio::DRIVER_DEVICE);
diff --git a/debian/patches/series b/debian/patches/series
index 50a9fea..bf03eb1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 02_wrong_function_name.patch
 03_version_information_in_swig.patch
 04_wrong_handling_of_output_parameters.patch
+05_tests-in-chroot.patch

-- 
Debian packaging of libdevice-cdio-perl



More information about the Pkg-perl-cvs-commits mailing list