diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2015-11-02 17:37:17 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-11-02 17:46:49 -0500 |
| commit | 70f1e0c27a7971ae7520a4e137f642103f8a81f7 (patch) | |
| tree | c7d752f027a3d0231da89edadc6d627d05160407 /media-gfx | |
| parent | media-gfx/sane-backends: rework html testdata version update logic (diff) | |
| download | gentoo-70f1e0c27a7971ae7520a4e137f642103f8a81f7.tar.gz gentoo-70f1e0c27a7971ae7520a4e137f642103f8a81f7.tar.bz2 gentoo-70f1e0c27a7971ae7520a4e137f642103f8a81f7.zip | |
media-gfx/sane-backends: disable test that relies on USB support
Diffstat (limited to 'media-gfx')
3 files changed, 17 insertions, 1 deletions
diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.25-disable-usb-tests.patch b/media-gfx/sane-backends/files/sane-backends-1.0.25-disable-usb-tests.patch new file mode 100644 index 000000000000..217a4408e2ff --- /dev/null +++ b/media-gfx/sane-backends/files/sane-backends-1.0.25-disable-usb-tests.patch @@ -0,0 +1,14 @@ +do not let the tests try reading/locking usb hardware. we also disable +this because the test will abort() if no usb support is found at all. + +--- a/testsuite/sanei/sanei_usb_test.c ++++ b/testsuite/sanei/sanei_usb_test.c +@@ -832,6 +832,8 @@ main (int argc, char **argv) + int detected, opened, i; + SANE_Int dn[MAX_DEVICES]; + ++ return 77; ++ + #ifdef HAVE_LIBUSB + printf ("\n%s built with old libusb\n\n", argv[0]); + #endif diff --git a/media-gfx/sane-backends/sane-backends-1.0.25_pre20150628.ebuild b/media-gfx/sane-backends/sane-backends-1.0.25_pre20150628.ebuild index d8cec103cdb5..61a6e8fc0f35 100644 --- a/media-gfx/sane-backends/sane-backends-1.0.25_pre20150628.ebuild +++ b/media-gfx/sane-backends/sane-backends-1.0.25_pre20150628.ebuild @@ -197,7 +197,8 @@ src_prepare() { "${FILESDIR}"/${PN}-1.0.24-automagic_systemd.patch \ "${FILESDIR}"/${PN}-1.0.24-systemd_pkgconfig.patch \ "${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch \ - "${FILESDIR}"/${PN}-1.0.24-cross-compile.patch + "${FILESDIR}"/${PN}-1.0.24-cross-compile.patch \ + "${FILESDIR}"/${PN}-1.0.25-disable-usb-tests.patch # Fix for "make check". sed -i -e 's/sane-backends 1.0.24/sane-backends 1.0.25git/' testsuite/tools/data/html* mv configure.{in,ac} || die diff --git a/media-gfx/sane-backends/sane-backends-9999.ebuild b/media-gfx/sane-backends/sane-backends-9999.ebuild index b636bf116f0b..9743a91699b1 100644 --- a/media-gfx/sane-backends/sane-backends-9999.ebuild +++ b/media-gfx/sane-backends/sane-backends-9999.ebuild @@ -190,6 +190,7 @@ src_prepare() { epkowa EOF epatch "${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch + epatch "${FILESDIR}"/${PN}-1.0.25-disable-usb-tests.patch mv configure.{in,ac} || die AT_NOELIBTOOLIZE=yes eautoreconf |