mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-16 00:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

ptest-packagelists: Simplify ptest list/code

Browse Source 
All the usage sites remove the -ptest suffix. Simply the original list
instead and clean up the code.

(From OE-Core rev: 4a28057849f9edc6ac06d115531f579673d788b5)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2023-03-11 21:01:51 +00:00
parent 5850561b05
commit 3419f8340c
4 changed files with 129 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meta/classes-recipe/ptest.bbclass
View File

@@ -138,5 +138,5 @@ def package_qa_check_missing_ptest(pn, d, messages):
return return
enabled_ptests = " ".join([d.getVar('PTESTS_FAST'), d.getVar('PTESTS_SLOW'), d.getVar('PTESTS_PROBLEMS')]).split() enabled_ptests = " ".join([d.getVar('PTESTS_FAST'), d.getVar('PTESTS_SLOW'), d.getVar('PTESTS_PROBLEMS')]).split()
if (pn + "-ptest").replace(d.getVar('MLPREFIX'), '') not in enabled_ptests: if pn.replace(d.getVar('MLPREFIX'), '') not in enabled_ptests:
oe.qa.handle_error("missing-ptest", "supports ptests but is not included in oe-core's ptest-packagelists.inc", d) oe.qa.handle_error("missing-ptest", "supports ptests but is not included in oe-core's ptest-packagelists.inc", d)

250
meta/conf/distro/include/ptest-packagelists.inc
View File

@@ -4,137 +4,137 @@
# ptests which take less than ~30s each # ptests which take less than ~30s each
# #
PTESTS_FAST = "\ PTESTS_FAST = "\
acl-ptest \ acl \
apr-util-ptest \ apr-util \
attr-ptest \ attr \
babeltrace-ptest \ babeltrace \
babeltrace2-ptest \ babeltrace2 \
bc-ptest \ bc \
bluez5-ptest \ bluez5 \
busybox-ptest \ busybox \
cpio-ptest \ cpio \
diffstat-ptest \ diffstat \
diffutils-ptest \ diffutils \
ethtool-ptest \ ethtool \
expat-ptest \ expat \
findutils-ptest \ findutils \
flex-ptest \ flex \
gawk-ptest \ gawk \
gdbm-ptest \ gdbm \
gdk-pixbuf-ptest \ gdk-pixbuf \
glib-networking-ptest \ glib-networking \
gzip-ptest \ gzip \
json-c-ptest \ json-c \
json-glib-ptest \ json-glib \
libconvert-asn1-perl-ptest \ libconvert-asn1-perl \
liberror-perl-ptest \ liberror-perl \
libgpg-error-ptest\ libgpg-error\
libnl-ptest \ libnl \
libpcre-ptest \ libpcre \
libssh2-ptest \ libssh2 \
libtimedate-perl-ptest \ libtimedate-perl \
libtest-fatal-perl-ptest \ libtest-fatal-perl \
libtest-needs-perl-ptest \ libtest-needs-perl \
libtest-warnings-perl-ptest \ libtest-warnings-perl \
libtry-tiny-perl-ptest \ libtry-tiny-perl \
liburi-perl-ptest \ liburi-perl \
libusb1-ptest \ libusb1 \
libxml-namespacesupport-perl-ptest \ libxml-namespacesupport-perl \
libxml-perl-ptest \ libxml-perl \
libxml-parser-perl-ptest \ libxml-parser-perl \
libxml-sax-perl-ptest \ libxml-sax-perl \
libxml-sax-base-perl-ptest \ libxml-sax-base-perl \
libxml-simple-perl-ptest \ libxml-simple-perl \
libxml2-ptest \ libxml2 \
lua-ptest \ lua \
lzo-ptest \ lzo \
m4-ptest \ m4 \
nettle-ptest \ nettle \
opkg-ptest \ opkg \
pango-ptest \ pango \
popt-ptest \ popt \
python3-atomicwrites-ptest \ python3-atomicwrites \
python3-bcrypt-ptest \ python3-bcrypt \
python3-hypothesis-ptest \ python3-hypothesis \
python3-jinja2-ptest \ python3-jinja2 \
python3-jsonpointer-ptest \ python3-jsonpointer \
python3-markupsafe-ptest \ python3-markupsafe \
python3-more-itertools-ptest \ python3-more-itertools \
python3-pluggy-ptest \ python3-pluggy \
python3-pyasn1-ptest \ python3-pyasn1 \
python3-pytz-ptest \ python3-pytz \
python3-wcwidth-ptest \ python3-wcwidth \
python3-webcolors-ptest \ python3-webcolors \
qemu-ptest \ qemu \
quilt-ptest \ quilt \
sed-ptest \ sed \
slang-ptest \ slang \
wayland-ptest \ wayland \
zlib-ptest \ zlib \
" "
PTESTS_FAST:append:libc-glibc = " glibc-tests-ptest" PTESTS_FAST:append:libc-glibc = " glibc-tests"
PTESTS_PROBLEMS:remove:libc-glibc = "glibc-tests-ptest" PTESTS_PROBLEMS:remove:libc-glibc = "glibc-tests"
PTESTS_FAST:remove:mips64 = "qemu-ptest" PTESTS_FAST:remove:mips64 = "qemu"
PTESTS_PROBLEMS:append:mips64 = " qemu-ptest" PTESTS_PROBLEMS:append:mips64 = " qemu"
PTESTS_FAST:remove:riscv32 = "qemu-ptest" PTESTS_FAST:remove:riscv32 = "qemu"
PTESTS_PROBLEMS:append:riscv32 = " qemu-ptest" PTESTS_PROBLEMS:append:riscv32 = " qemu"
PTESTS_SLOW = "\ PTESTS_SLOW = "\
apr-ptest \ apr \
bzip2-ptest \ bzip2 \
coreutils-ptest \ coreutils \
curl-ptest \ curl \
dbus-ptest \ dbus \
e2fsprogs-ptest \ e2fsprogs \
elfutils-ptest \ elfutils \
gettext-ptest \ gettext \
glib-2.0-ptest \ glib-2.0 \
gnutls-ptest \ gnutls \
gstreamer1.0-ptest \ gstreamer1.0 \
libevent-ptest \ libevent \
libgcrypt-ptest \ libgcrypt \
libmodule-build-perl-ptest \ libmodule-build-perl \
lttng-tools-ptest \ lttng-tools \
openssh-ptest \ openssh \
openssl-ptest \ openssl \
parted-ptest \ parted \
perl-ptest \ perl \
python3-cryptography-ptest \ python3-cryptography \
python3-ptest \ python3 \
strace-ptest \ strace \
tcl-ptest \ tcl \
util-linux-ptest \ util-linux \
valgrind-ptest \ valgrind \
" "
PTESTS_SLOW:remove:riscv64 = "valgrind-ptest" PTESTS_SLOW:remove:riscv64 = "valgrind"
PTESTS_PROBLEMS:append:riscv64 = " valgrind-ptest" PTESTS_PROBLEMS:append:riscv64 = " valgrind"
PTESTS_SLOW:append:libc-musl = " libc-test-ptest" PTESTS_SLOW:append:libc-musl = " libc-test"
PTESTS_SLOW:remove:x86 = "valgrind-ptest" PTESTS_SLOW:remove:x86 = "valgrind"
PTESTS_PROBLEMS:append:x86 = " valgrind-ptest" PTESTS_PROBLEMS:append:x86 = " valgrind"
# ruby-ptest \ # Timeout # ruby \ # Timeout
# lz4-ptest \ # Needs a rewrite # lz4 \ # Needs a rewrite
# rt-tests-ptest \ # Needs to be checked whether it runs at all # rt-tests \ # Needs to be checked whether it runs at all
# bash-ptest \ # Test outcomes are non-deterministic by design # bash \ # Test outcomes are non-deterministic by design
# ifupdown-ptest \ # Tested separately in lib/oeqa/selftest/cases/imagefeatures.py # ifupdown \ # Tested separately in lib/oeqa/selftest/cases/imagefeatures.py
# mdadm-ptest \ # Tests rely on non-deterministic sleep() amounts # mdadm \ # Tests rely on non-deterministic sleep() amounts
# libinput-ptest \ # Tests need an unloaded system to be reliable # libinput \ # Tests need an unloaded system to be reliable
# libpam-ptest \ # Needs pam DISTRO_FEATURE # libpam \ # Needs pam DISTRO_FEATURE
# numactl-ptest \ # qemu not (yet) configured for numa; all tests are skipped # numactl \ # qemu not (yet) configured for numa; all tests are skipped
# libseccomp-ptest \ # tests failed: 38; add to slow tests once addressed # libseccomp \ # tests failed: 38; add to slow tests once addressed
# python3-numpy-ptest \ # requires even more RAM and (possibly) disk space; multiple failures # python3-numpy \ # requires even more RAM and (possibly) disk space; multiple failures
PTESTS_PROBLEMS = "\ PTESTS_PROBLEMS = "\
ruby-ptest \ ruby \
lz4-ptest \ lz4 \
rt-tests-ptest \ rt-tests \
bash-ptest \ bash \
ifupdown-ptest \ ifupdown \
mdadm-ptest \ mdadm \
libinput-ptest \ libinput \
libpam-ptest \ libpam \
libseccomp-ptest \ libseccomp \
numactl-ptest \ numactl \
python3-numpy-ptest \ python3-numpy \
" "

4
meta/recipes-core/images/core-image-ptest-all.bb
View File

@@ -12,9 +12,9 @@ require conf/distro/include/ptest-packagelists.inc
PTESTS = "${PTESTS_FAST} ${PTESTS_SLOW}" PTESTS = "${PTESTS_FAST} ${PTESTS_SLOW}"
do_testimage[noexec] = "1" do_testimage[noexec] = "1"
do_testimage[depends] = "${@' '.join(['core-image-ptest-'+x.replace('-ptest', '')+':do_testimage' for x in d.getVar('PTESTS').split()])}" do_testimage[depends] = "${@' '.join(['core-image-ptest-'+x+':do_testimage' for x in d.getVar('PTESTS').split()])}"
do_build[depends] = "${@' '.join(['core-image-ptest-'+x.replace('-ptest', '')+':do_build' for x in d.getVar('PTESTS').split()])}" do_build[depends] = "${@' '.join(['core-image-ptest-'+x+':do_build' for x in d.getVar('PTESTS').split()])}"
# normally image.bbclass would do this # normally image.bbclass would do this
EXCLUDE_FROM_WORLD = "1" EXCLUDE_FROM_WORLD = "1"

2
meta/recipes-core/images/core-image-ptest.bb
View File

@@ -11,7 +11,7 @@ PTESTS = "${PTESTS_SLOW} ${PTESTS_FAST}"
IMAGE_INSTALL:append = " ${MCNAME}-ptest openssh" IMAGE_INSTALL:append = " ${MCNAME}-ptest openssh"
BBCLASSEXTEND = "${@' '.join(['mcextend:'+x.replace('-ptest', '') for x in d.getVar('PTESTS').split()])}" BBCLASSEXTEND = "${@' '.join(['mcextend:'+x for x in d.getVar('PTESTS').split()])}"
# The image can sufficiently large (~1.8GB) that we need to be careful that it fits in a live # The image can sufficiently large (~1.8GB) that we need to be careful that it fits in a live
# image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the # image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the