From 01bea4ef932e46eb2fcc8b4be7ff5e2b5b2a0978 Mon Sep 17 00:00:00 2001 From: Björn Stenberg Date: Wed, 10 Apr 2013 15:34:56 +0200 Subject: ptest bug fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Move ${PN}-ptest to start of PACKAGES to ensure all ptest files are packaged in the -ptest package. Add QA exclusions to insane.bbclass to ensure -ptest packages can contain any files they need. Disable ptest for native packages. Don't emit errors on missing _ptest functions. Signed-off-by: Björn Stenberg Signed-off-by: Anders Roxell Signed-off-by: Josep Puigdemont Signed-off-by: Richard Purdie --- meta/classes/ptest.bbclass | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'meta/classes/ptest.bbclass') diff --git a/meta/classes/ptest.bbclass b/meta/classes/ptest.bbclass index 6ab5ee411f..37357e8215 100644 --- a/meta/classes/ptest.bbclass +++ b/meta/classes/ptest.bbclass @@ -7,25 +7,18 @@ DESCRIPTION_${PN}-ptest ?= "${DESCRIPTION} \ This package contains a test directory ${PTEST_PATH} for package test purposes." PTEST_PATH ?= "${libdir}/${PN}/ptest" -FILES_${PN}-ptest = "${PTEST_PATH}/*" +FILES_${PN}-ptest = "${PTEST_PATH}" SECTION_${PN}-ptest = "devel" ALLOW_EMPTY_${PN}-ptest = "1" PTEST_ENABLED = "${@base_contains("DISTRO_FEATURES", "ptest", "1", "0", d)}" RDEPENDS_${PN}-ptest_virtclass-native = "" RDEPENDS_${PN}-ptest_virtclass-nativesdk = "" -PACKAGES += "${@base_contains('DISTRO_FEATURES', 'ptest', '${PN}-ptest', '', d)}" - -FILES_${PN}-dbg += "${PTEST_PATH}/.debug \ - ${PTEST_PATH}/*/.debug \ - ${PTEST_PATH}/*/*/.debug \ - ${PTEST_PATH}/*/*/*/.debug \ - ${PTEST_PATH}/*/*/*/*/.debug \ - " +PACKAGES =+ "${@base_contains('DISTRO_FEATURES', 'ptest', '${PN}-ptest', '', d)}" do_configure_ptest_base() { if [ ${PTEST_ENABLED} = 1 ]; then - if [ type -t do_configure_ptest = function ]; then + if [ a$(type -t do_configure_ptest) = afunction ]; then do_configure_ptest fi fi @@ -33,7 +26,7 @@ do_configure_ptest_base() { do_compile_ptest_base() { if [ ${PTEST_ENABLED} = 1 ]; then - if [ type -t do_compile_ptest = function ]; then + if [ a$(type -t do_compile_ptest) = afunction ]; then do_compile_ptest fi fi @@ -46,7 +39,7 @@ do_install_ptest_base() { if grep -q install-ptest: Makefile; then oe_runmake DESTDIR=${D}${PTEST_PATH} install-ptest fi - if [ type -t do_install_ptest = function ]; then + if [ a$(type -t do_install_ptest) = afunction ]; then do_install_ptest fi fi -- cgit 1.2.3-korg