mirror of
https://git.yoctoproject.org/poky
synced 2026-04-20 18:32:12 +02:00
ptest-packagelists: Simplify ptest list/code
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
@@ -138,5 +138,5 @@ def package_qa_check_missing_ptest(pn, d, messages):
|
||||
return
|
||||
|
||||
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)
|
||||
|
||||
@@ -4,137 +4,137 @@
|
||||
# ptests which take less than ~30s each
|
||||
#
|
||||
PTESTS_FAST = "\
|
||||
acl-ptest \
|
||||
apr-util-ptest \
|
||||
attr-ptest \
|
||||
babeltrace-ptest \
|
||||
babeltrace2-ptest \
|
||||
bc-ptest \
|
||||
bluez5-ptest \
|
||||
busybox-ptest \
|
||||
cpio-ptest \
|
||||
diffstat-ptest \
|
||||
diffutils-ptest \
|
||||
ethtool-ptest \
|
||||
expat-ptest \
|
||||
findutils-ptest \
|
||||
flex-ptest \
|
||||
gawk-ptest \
|
||||
gdbm-ptest \
|
||||
gdk-pixbuf-ptest \
|
||||
glib-networking-ptest \
|
||||
gzip-ptest \
|
||||
json-c-ptest \
|
||||
json-glib-ptest \
|
||||
libconvert-asn1-perl-ptest \
|
||||
liberror-perl-ptest \
|
||||
libgpg-error-ptest\
|
||||
libnl-ptest \
|
||||
libpcre-ptest \
|
||||
libssh2-ptest \
|
||||
libtimedate-perl-ptest \
|
||||
libtest-fatal-perl-ptest \
|
||||
libtest-needs-perl-ptest \
|
||||
libtest-warnings-perl-ptest \
|
||||
libtry-tiny-perl-ptest \
|
||||
liburi-perl-ptest \
|
||||
libusb1-ptest \
|
||||
libxml-namespacesupport-perl-ptest \
|
||||
libxml-perl-ptest \
|
||||
libxml-parser-perl-ptest \
|
||||
libxml-sax-perl-ptest \
|
||||
libxml-sax-base-perl-ptest \
|
||||
libxml-simple-perl-ptest \
|
||||
libxml2-ptest \
|
||||
lua-ptest \
|
||||
lzo-ptest \
|
||||
m4-ptest \
|
||||
nettle-ptest \
|
||||
opkg-ptest \
|
||||
pango-ptest \
|
||||
popt-ptest \
|
||||
python3-atomicwrites-ptest \
|
||||
python3-bcrypt-ptest \
|
||||
python3-hypothesis-ptest \
|
||||
python3-jinja2-ptest \
|
||||
python3-jsonpointer-ptest \
|
||||
python3-markupsafe-ptest \
|
||||
python3-more-itertools-ptest \
|
||||
python3-pluggy-ptest \
|
||||
python3-pyasn1-ptest \
|
||||
python3-pytz-ptest \
|
||||
python3-wcwidth-ptest \
|
||||
python3-webcolors-ptest \
|
||||
qemu-ptest \
|
||||
quilt-ptest \
|
||||
sed-ptest \
|
||||
slang-ptest \
|
||||
wayland-ptest \
|
||||
zlib-ptest \
|
||||
acl \
|
||||
apr-util \
|
||||
attr \
|
||||
babeltrace \
|
||||
babeltrace2 \
|
||||
bc \
|
||||
bluez5 \
|
||||
busybox \
|
||||
cpio \
|
||||
diffstat \
|
||||
diffutils \
|
||||
ethtool \
|
||||
expat \
|
||||
findutils \
|
||||
flex \
|
||||
gawk \
|
||||
gdbm \
|
||||
gdk-pixbuf \
|
||||
glib-networking \
|
||||
gzip \
|
||||
json-c \
|
||||
json-glib \
|
||||
libconvert-asn1-perl \
|
||||
liberror-perl \
|
||||
libgpg-error\
|
||||
libnl \
|
||||
libpcre \
|
||||
libssh2 \
|
||||
libtimedate-perl \
|
||||
libtest-fatal-perl \
|
||||
libtest-needs-perl \
|
||||
libtest-warnings-perl \
|
||||
libtry-tiny-perl \
|
||||
liburi-perl \
|
||||
libusb1 \
|
||||
libxml-namespacesupport-perl \
|
||||
libxml-perl \
|
||||
libxml-parser-perl \
|
||||
libxml-sax-perl \
|
||||
libxml-sax-base-perl \
|
||||
libxml-simple-perl \
|
||||
libxml2 \
|
||||
lua \
|
||||
lzo \
|
||||
m4 \
|
||||
nettle \
|
||||
opkg \
|
||||
pango \
|
||||
popt \
|
||||
python3-atomicwrites \
|
||||
python3-bcrypt \
|
||||
python3-hypothesis \
|
||||
python3-jinja2 \
|
||||
python3-jsonpointer \
|
||||
python3-markupsafe \
|
||||
python3-more-itertools \
|
||||
python3-pluggy \
|
||||
python3-pyasn1 \
|
||||
python3-pytz \
|
||||
python3-wcwidth \
|
||||
python3-webcolors \
|
||||
qemu \
|
||||
quilt \
|
||||
sed \
|
||||
slang \
|
||||
wayland \
|
||||
zlib \
|
||||
"
|
||||
PTESTS_FAST:append:libc-glibc = " glibc-tests-ptest"
|
||||
PTESTS_PROBLEMS:remove:libc-glibc = "glibc-tests-ptest"
|
||||
PTESTS_FAST:remove:mips64 = "qemu-ptest"
|
||||
PTESTS_PROBLEMS:append:mips64 = " qemu-ptest"
|
||||
PTESTS_FAST:remove:riscv32 = "qemu-ptest"
|
||||
PTESTS_PROBLEMS:append:riscv32 = " qemu-ptest"
|
||||
PTESTS_FAST:append:libc-glibc = " glibc-tests"
|
||||
PTESTS_PROBLEMS:remove:libc-glibc = "glibc-tests"
|
||||
PTESTS_FAST:remove:mips64 = "qemu"
|
||||
PTESTS_PROBLEMS:append:mips64 = " qemu"
|
||||
PTESTS_FAST:remove:riscv32 = "qemu"
|
||||
PTESTS_PROBLEMS:append:riscv32 = " qemu"
|
||||
|
||||
PTESTS_SLOW = "\
|
||||
apr-ptest \
|
||||
bzip2-ptest \
|
||||
coreutils-ptest \
|
||||
curl-ptest \
|
||||
dbus-ptest \
|
||||
e2fsprogs-ptest \
|
||||
elfutils-ptest \
|
||||
gettext-ptest \
|
||||
glib-2.0-ptest \
|
||||
gnutls-ptest \
|
||||
gstreamer1.0-ptest \
|
||||
libevent-ptest \
|
||||
libgcrypt-ptest \
|
||||
libmodule-build-perl-ptest \
|
||||
lttng-tools-ptest \
|
||||
openssh-ptest \
|
||||
openssl-ptest \
|
||||
parted-ptest \
|
||||
perl-ptest \
|
||||
python3-cryptography-ptest \
|
||||
python3-ptest \
|
||||
strace-ptest \
|
||||
tcl-ptest \
|
||||
util-linux-ptest \
|
||||
valgrind-ptest \
|
||||
apr \
|
||||
bzip2 \
|
||||
coreutils \
|
||||
curl \
|
||||
dbus \
|
||||
e2fsprogs \
|
||||
elfutils \
|
||||
gettext \
|
||||
glib-2.0 \
|
||||
gnutls \
|
||||
gstreamer1.0 \
|
||||
libevent \
|
||||
libgcrypt \
|
||||
libmodule-build-perl \
|
||||
lttng-tools \
|
||||
openssh \
|
||||
openssl \
|
||||
parted \
|
||||
perl \
|
||||
python3-cryptography \
|
||||
python3 \
|
||||
strace \
|
||||
tcl \
|
||||
util-linux \
|
||||
valgrind \
|
||||
"
|
||||
|
||||
PTESTS_SLOW:remove:riscv64 = "valgrind-ptest"
|
||||
PTESTS_PROBLEMS:append:riscv64 = " valgrind-ptest"
|
||||
PTESTS_SLOW:append:libc-musl = " libc-test-ptest"
|
||||
PTESTS_SLOW:remove:x86 = "valgrind-ptest"
|
||||
PTESTS_PROBLEMS:append:x86 = " valgrind-ptest"
|
||||
PTESTS_SLOW:remove:riscv64 = "valgrind"
|
||||
PTESTS_PROBLEMS:append:riscv64 = " valgrind"
|
||||
PTESTS_SLOW:append:libc-musl = " libc-test"
|
||||
PTESTS_SLOW:remove:x86 = "valgrind"
|
||||
PTESTS_PROBLEMS:append:x86 = " valgrind"
|
||||
|
||||
# ruby-ptest \ # Timeout
|
||||
# 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
|
||||
# ruby \ # Timeout
|
||||
# lz4 \ # Needs a rewrite
|
||||
# rt-tests \ # Needs to be checked whether it runs at all
|
||||
# bash \ # Test outcomes are non-deterministic by design
|
||||
# ifupdown \ # Tested separately in lib/oeqa/selftest/cases/imagefeatures.py
|
||||
# mdadm \ # Tests rely on non-deterministic sleep() amounts
|
||||
# libinput \ # Tests need an unloaded system to be reliable
|
||||
# libpam \ # Needs pam DISTRO_FEATURE
|
||||
# numactl \ # qemu not (yet) configured for numa; all tests are skipped
|
||||
# libseccomp \ # tests failed: 38; add to slow tests once addressed
|
||||
# python3-numpy \ # requires even more RAM and (possibly) disk space; multiple failures
|
||||
|
||||
PTESTS_PROBLEMS = "\
|
||||
ruby-ptest \
|
||||
lz4-ptest \
|
||||
rt-tests-ptest \
|
||||
bash-ptest \
|
||||
ifupdown-ptest \
|
||||
mdadm-ptest \
|
||||
libinput-ptest \
|
||||
libpam-ptest \
|
||||
libseccomp-ptest \
|
||||
numactl-ptest \
|
||||
python3-numpy-ptest \
|
||||
ruby \
|
||||
lz4 \
|
||||
rt-tests \
|
||||
bash \
|
||||
ifupdown \
|
||||
mdadm \
|
||||
libinput \
|
||||
libpam \
|
||||
libseccomp \
|
||||
numactl \
|
||||
python3-numpy \
|
||||
"
|
||||
|
||||
@@ -12,9 +12,9 @@ require conf/distro/include/ptest-packagelists.inc
|
||||
PTESTS = "${PTESTS_FAST} ${PTESTS_SLOW}"
|
||||
|
||||
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
|
||||
EXCLUDE_FROM_WORLD = "1"
|
||||
|
||||
@@ -11,7 +11,7 @@ PTESTS = "${PTESTS_SLOW} ${PTESTS_FAST}"
|
||||
|
||||
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
|
||||
# image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the
|
||||
|
||||
Reference in New Issue
Block a user