summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-08 19:57:49 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-14 11:14:40 +0000
commit8c4ba1afdde782c4a497fa501a61af6bff53375f (patch)
treea64814ee2dd37df55a8f4f75ea0511d1c9e5b56f /meta/classes
parent633bd85270922d71ab4b1f94cd166da51fbe1458 (diff)
downloadpoky-8c4ba1afdde782c4a497fa501a61af6bff53375f.tar.gz
testimage: Simplfy DEFAULT_TEST_SUITES logic
Now that the tests have correct markup to automatically determine which images they can run against, clean up the default test suites logic to be simpler and not image specific. Some cleanup of the compiler tests still needs to be completed but this is a good first step. The only downside to this is more noise during testing as we now see many skipped messages for simple images like core-image-minimal. The auto type is being removed since it currently breaks badly due to the socat mandatory inclusion from the meta-selftest layer which is a problem which needs to be addressed seperately. (From OE-Core rev: 4966bc33845752eb0aeae54b72e8ba0146a7ed52) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/testimage.bbclass32
1 files changed, 9 insertions, 23 deletions
diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
index d7dac24c92..59d8c4e8e2 100644
--- a/meta/classes/testimage.bbclass
+++ b/meta/classes/testimage.bbclass
@@ -40,31 +40,17 @@ TEST_NEEDED_PACKAGES_DIR ?= "${WORKDIR}/testimage/packages"
40TEST_EXTRACTED_DIR ?= "${TEST_NEEDED_PACKAGES_DIR}/extracted" 40TEST_EXTRACTED_DIR ?= "${TEST_NEEDED_PACKAGES_DIR}/extracted"
41TEST_PACKAGED_DIR ?= "${TEST_NEEDED_PACKAGES_DIR}/packaged" 41TEST_PACKAGED_DIR ?= "${TEST_NEEDED_PACKAGES_DIR}/packaged"
42 42
43PKGMANTESTSUITE = "\ 43BASICTESTSUITE = "\
44 ping date df ssh scp python perl gi ptest parselogs \
45 logrotate connman systemd oe_syslog pam stap ldd xorg \
44 ${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'dnf rpm', '', d)} \ 46 ${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'dnf rpm', '', d)} \
45 ${@bb.utils.contains('IMAGE_PKGTYPE', 'ipk', 'opkg', '', d)} \ 47 ${@bb.utils.contains('IMAGE_PKGTYPE', 'ipk', 'opkg', '', d)} \
46 ${@bb.utils.contains('IMAGE_PKGTYPE', 'deb', 'apt', '', d)} \ 48 ${@bb.utils.contains('IMAGE_PKGTYPE', 'deb', 'apt', '', d)}"
47 " 49DEVTESTSUITE = "gcc kernelmodule buildcpio buildlzip buildgalculator "
48SYSTEMDSUITE = "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" 50
49MINTESTSUITE = "ping" 51DEFAULT_TEST_SUITES = "${BASICTESTSUITE}"
50NETTESTSUITE = "${MINTESTSUITE} ssh df date scp oe_syslog ${SYSTEMDSUITE}" 52DEFAULT_TEST_SUITES_pn-core-image-sato-sdk = "${BASICTESTSUITE} ${DEVTESTSUITE}"
51DEVTESTSUITE = "gcc kernelmodule ldd" 53DEFAULT_TEST_SUITES_pn-core-image-lsb-sdk = "${BASICTESTSUITE} ${DEVTESTSUITE}"
52PTESTTESTSUITE = "${MINTESTSUITE} ssh scp ptest"
53
54DEFAULT_TEST_SUITES = "${MINTESTSUITE} auto"
55DEFAULT_TEST_SUITES_pn-core-image-minimal = "${MINTESTSUITE}"
56DEFAULT_TEST_SUITES_pn-core-image-minimal-dev = "${MINTESTSUITE}"
57DEFAULT_TEST_SUITES_pn-core-image-full-cmdline = "${NETTESTSUITE} perl python logrotate ptest"
58DEFAULT_TEST_SUITES_pn-core-image-x11 = "${MINTESTSUITE}"
59DEFAULT_TEST_SUITES_pn-core-image-lsb = "${NETTESTSUITE} pam parselogs ${PKGMANTESTSUITE} ptest"
60DEFAULT_TEST_SUITES_pn-core-image-sato = "${NETTESTSUITE} connman xorg parselogs ${PKGMANTESTSUITE} \
61 ${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'python', '', d)} ptest gi"
62DEFAULT_TEST_SUITES_pn-core-image-sato-sdk = "${NETTESTSUITE} buildcpio buildlzip buildgalculator \
63 connman ${DEVTESTSUITE} logrotate perl parselogs python ${PKGMANTESTSUITE} xorg ptest gi stap"
64DEFAULT_TEST_SUITES_pn-core-image-lsb-dev = "${NETTESTSUITE} pam perl python parselogs ${PKGMANTESTSUITE} ptest gi"
65DEFAULT_TEST_SUITES_pn-core-image-lsb-sdk = "${NETTESTSUITE} buildcpio buildlzip buildgalculator \
66 connman ${DEVTESTSUITE} logrotate pam parselogs perl python ${PKGMANTESTSUITE} ptest gi stap"
67DEFAULT_TEST_SUITES_pn-meta-toolchain = "auto"
68 54
69# aarch64 has no graphics 55# aarch64 has no graphics
70DEFAULT_TEST_SUITES_remove_aarch64 = "xorg" 56DEFAULT_TEST_SUITES_remove_aarch64 = "xorg"