From ed2f7a2bf6596867cef92dbbfb5f9e5d842b5366 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 7 Feb 2014 11:06:50 +0000 Subject: gdk-pixbuf: enable ptest (From OE-Core rev: b78d9b2f059f3f87c474bba8eb6258bb7299cabc) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.3.bb | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.3.bb') diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.3.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.3.bb index 187af46a99..85a7b439de 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.3.bb +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.3.bb @@ -16,12 +16,14 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ file://hardcoded_libtool.patch \ file://extending-libinstall-dependencies.patch \ + file://run-ptest \ + file://tests-check.patch \ " SRC_URI[md5sum] = "81161cc895eb43afd9ae7354b87e2261" SRC_URI[sha256sum] = "c229c53f59573eab9410b53690a4b9db770312c80a4d84ecd6295aa894574494" -inherit autotools pkgconfig gettext pixbufcache +inherit autotools pkgconfig gettext pixbufcache ptest LIBV = "2.10.0" @@ -42,6 +44,7 @@ PACKAGECONFIG[x11] = "--with-x11,--without-x11,virtual/libx11" EXTRA_OECONF = "\ --disable-introspection \ + ${@base_contains('DISTRO_FEATURES', 'ptest', '--enable-installed-tests', '--disable-installed-tests', d)} \ " PACKAGES =+ "${PN}-xlib" @@ -64,6 +67,11 @@ FILES_${PN}-dbg += " \ ${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders/.debug/* \ " +FILES_${PN}-ptest += "${libdir}/gdk-pixbuf/installed-tests \ + ${datadir}/installed-tests/gdk-pixbuf" + +RDEPENDS_${PN}-ptest += "gnome-desktop-testing" + PACKAGES_DYNAMIC += "^gdk-pixbuf-loader-.*" PACKAGES_DYNAMIC_class-native = "" @@ -72,7 +80,12 @@ python populate_packages_prepend () { loaders_root = d.expand('${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders') - d.setVar('PIXBUF_PACKAGES', ' '.join(do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s'))) + packages = ' '.join(do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s')) + d.setVar('PIXBUF_PACKAGES', packages) + + # The test suite exercises all the loaders, so ensure they are all + # dependencies of the ptest package. + d.appendVar("RDEPENDS_gdk-pixbuf-ptest", " " + packages) } do_install_append_class-native() { -- cgit v1.2.3-54-g00ecf