From a6f18016c40a824405ed80ac57476c87e111cf4c Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 7 May 2021 20:48:01 +0200 Subject: ptest: add a test for orphaned ptests, and restore ones found by it Particularly, numactl, numpy and libseccomp are disabled for now due to failures or lack of qemu support. The rest have been verified to pass quickly. [RP: Fix multilib recipe handling] (From OE-Core rev: 8bb5da87000ade519529e44181448244bd94d4f5) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/classes/ptest.bbclass | 11 ++++++ meta/conf/distro/include/ptest-packagelists.inc | 50 +++++++++++++++++++------ 2 files changed, 50 insertions(+), 11 deletions(-) diff --git a/meta/classes/ptest.bbclass b/meta/classes/ptest.bbclass index 47611edea2..466916299a 100644 --- a/meta/classes/ptest.bbclass +++ b/meta/classes/ptest.bbclass @@ -20,6 +20,8 @@ RRECOMMENDS_${PN}-ptest += "ptest-runner" PACKAGES =+ "${@bb.utils.contains('PTEST_ENABLED', '1', '${PN}-ptest', '', d)}" +require conf/distro/include/ptest-packagelists.inc + do_configure_ptest() { : } @@ -116,4 +118,13 @@ python () { if not(d.getVar('PTEST_ENABLED') == "1"): for i in ['do_configure_ptest_base', 'do_compile_ptest_base', 'do_install_ptest_base']: bb.build.deltask(i, d) + + # This checks that ptest package is actually included + # in standard oe-core ptest images - only for oe-core recipes + if not 'meta/recipes' in d.getVar('FILE') or not(d.getVar('PTEST_ENABLED') == "1"): + return + + enabled_ptests = " ".join([d.getVar('PTESTS_FAST'),d.getVar('PTESTS_SLOW'), d.getVar('PTESTS_PROBLEMS')]).split() + if (d.getVar('PN') + "-ptest").replace(d.getVar('MLPREFIX'), '') not in enabled_ptests: + bb.error("Recipe %s supports ptests but is not included in oe-core's conf/distro/include/ptest-packagelists.inc" % d.getVar("PN")) } diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index 70d5fa8877..aef70343f6 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc @@ -20,12 +20,15 @@ PTESTS_FAST = "\ gdbm-ptest \ gdk-pixbuf-ptest \ gettext-ptest \ + glib-networking-ptest \ gzip-ptest \ json-glib-ptest \ libconvert-asn1-perl-ptest \ liberror-perl-ptest \ + libnl-ptest \ libmodule-build-perl-ptest \ libpcre-ptest \ + libssh2-ptest \ libtimedate-perl-ptest \ libtest-needs-perl-ptest \ liburi-perl-ptest \ @@ -44,6 +47,12 @@ PTESTS_FAST = "\ opkg-ptest \ pango-ptest \ parted-ptest \ + python3-atomicwrites-ptest \ + python3-jinja2-ptest \ + python3-markupsafe-ptest \ + python3-more-itertools-ptest \ + python3-pluggy-ptest \ + python3-wcwidth-ptest \ qemu-ptest \ quilt-ptest \ sed-ptest \ @@ -52,17 +61,7 @@ PTESTS_FAST = "\ zlib-ptest \ " PTESTS_FAST_remove_mips64 = "qemu-ptest" - -#PTESTS_PROBLEMS = "\ -# ruby-ptest \ # Timeout -# clutter-1.0-ptest \ # Doesn't build due to depends on cogl-1.0 -# lz4-ptest \ # Needs a rewrite -# rt-tests-ptest \ # Needs to be checked whether it runs at all -# bash-ptest \ # Test outcomes are non-deterministic by design -# ifupdown-ptest \ # Tested separately in lib/oeqa/selftest/cases/imagefeatures.py -# mdadm-ptest \ # Tests rely on non-deterministic sleep() amounts -# libinput-ptest \ # Tests need an unloaded system to be reliable -#" +PTESTS_PROBLEMS_append_mips64 = "qemu-ptest" PTESTS_SLOW = "\ babeltrace-ptest \ @@ -86,3 +85,32 @@ PTESTS_SLOW = "\ " PTESTS_SLOW_remove_riscv64 = "valgrind-ptest" +PTESTS_PROBLEMS_append_riscv64 = "valgrind-ptest" + +# ruby-ptest \ # Timeout +# clutter-1.0-ptest \ # Doesn't build due to depends on cogl-1.0 +# lz4-ptest \ # Needs a rewrite +# rt-tests-ptest \ # Needs to be checked whether it runs at all +# bash-ptest \ # Test outcomes are non-deterministic by design +# ifupdown-ptest \ # Tested separately in lib/oeqa/selftest/cases/imagefeatures.py +# mdadm-ptest \ # Tests rely on non-deterministic sleep() amounts +# libinput-ptest \ # Tests need an unloaded system to be reliable +# libpam-ptest \ # Needs pam DISTRO_FEATURE +# numactl-ptest \ # qemu not (yet) configured for numa; all tests are skipped +# libseccomp-ptest \ # tests failed: 38; add to slow tests once addressed +# python3-numpy-ptest \ # requires even more RAM and (possibly) disk space; multiple failures + +PTESTS_PROBLEMS = "\ + ruby-ptest \ + clutter-1.0-ptest \ + lz4-ptest \ + rt-tests-ptest \ + bash-ptest \ + ifupdown-ptest \ + mdadm-ptest \ + libinput-ptest \ + libpam-ptest \ + libseccomp-ptest \ + numactl-ptest \ + python3-numpy-ptest \ +" -- cgit v1.2.3-54-g00ecf