[OE-core] [PATCH 08/12] testimage: Simplfy DEFAULT_TEST_SUITES logic

[akuster808]

On 11/9/18 6:29 AM, Richard Purdie wrote:
> 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.
>
> Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
> ---
>  meta/classes/testimage.bbclass | 31 ++++++-------------------------
>  1 file changed, 6 insertions(+), 25 deletions(-)
>
> diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
> index ba2d9c491b2..b8acd3ce782 100644
> --- a/meta/classes/testimage.bbclass
> +++ b/meta/classes/testimage.bbclass
> @@ -40,31 +40,12 @@ TEST_NEEDED_PACKAGES_DIR ?= "${WORKDIR}/testimage/packages"
>  TEST_EXTRACTED_DIR ?= "${TEST_NEEDED_PACKAGES_DIR}/extracted"
>  TEST_PACKAGED_DIR ?= "${TEST_NEEDED_PACKAGES_DIR}/packaged"
>  
> -PKGMANTESTSUITE = "\
> -    ${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'dnf rpm', '', d)} \
> -    ${@bb.utils.contains('IMAGE_PKGTYPE', 'ipk', 'opkg', '', d)} \
> -    ${@bb.utils.contains('IMAGE_PKGTYPE', 'deb', 'apt', '', d)} \
> -    "
> -SYSTEMDSUITE = "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
> -MINTESTSUITE = "ping"
> -NETTESTSUITE = "${MINTESTSUITE} ssh df date scp oe_syslog ${SYSTEMDSUITE}"
> -DEVTESTSUITE = "gcc kernelmodule ldd"
> -PTESTTESTSUITE = "${MINTESTSUITE} ssh scp ptest"
> -
> -DEFAULT_TEST_SUITES = "${MINTESTSUITE} auto"
> -DEFAULT_TEST_SUITES_pn-core-image-minimal = "${MINTESTSUITE}"
> -DEFAULT_TEST_SUITES_pn-core-image-minimal-dev = "${MINTESTSUITE}"
> -DEFAULT_TEST_SUITES_pn-core-image-full-cmdline = "${NETTESTSUITE} perl python logrotate ptest"
> -DEFAULT_TEST_SUITES_pn-core-image-x11 = "${MINTESTSUITE}"
> -DEFAULT_TEST_SUITES_pn-core-image-lsb = "${NETTESTSUITE} pam parselogs ${PKGMANTESTSUITE} ptest"
> -DEFAULT_TEST_SUITES_pn-core-image-sato = "${NETTESTSUITE} connman xorg parselogs ${PKGMANTESTSUITE} \
> -    ${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'python', '', d)} ptest gi"
> -DEFAULT_TEST_SUITES_pn-core-image-sato-sdk = "${NETTESTSUITE} buildcpio buildlzip buildgalculator \
> -    connman ${DEVTESTSUITE} logrotate perl parselogs python ${PKGMANTESTSUITE} xorg ptest gi stap"
> -DEFAULT_TEST_SUITES_pn-core-image-lsb-dev = "${NETTESTSUITE} pam perl python parselogs ${PKGMANTESTSUITE} ptest gi"
> -DEFAULT_TEST_SUITES_pn-core-image-lsb-sdk = "${NETTESTSUITE} buildcpio buildlzip buildgalculator \
> -    connman ${DEVTESTSUITE} logrotate pam parselogs perl python ${PKGMANTESTSUITE} ptest gi stap"
> -DEFAULT_TEST_SUITES_pn-meta-toolchain = "auto"
> +BASICTESTSUITE = "ping date df ssh scp python perl apt opkg gi ptest dnf rpm parselogs logrotate connman systemd oe_syslog pam stap ldd xorg"

So now you are forcing me to run all those test if I just want to run
"Ptests" for my layer that don't have any of those additional pieces.

can we re-instate a basic "PTEST" variable so the rest of use can
leverage a common define? if not, i will have do it locally in my layer.

Nak for now.

- armin

> +DEVTESTSUITE = "gcc kernelmodule buildcpio buildlzip buildgalculator "
> +
> +DEFAULT_TEST_SUITES = "${BASICTESTSUITE}"
> +DEFAULT_TEST_SUITES_pn-core-image-sato-sdk = "${BASICTESTSUITE} ${DEVTESTSUITE}"
> +DEFAULT_TEST_SUITES_pn-core-image-lsb-sdk = "${BASICTESTSUITE} ${DEVTESTSUITE}"
>  
>  # aarch64 has no graphics
>  DEFAULT_TEST_SUITES_remove_aarch64 = "xorg"