Skip to contentSkip to conversation

testimage: add/modify DEFAULT_TEST_SUITES

PATCH In review Alex Franco 2 participants 6 messages Feb 23, 2016 – Feb 24, 2016

lore
Share & tools
lore

Alex Franco

author
#0 lore raw

v2 cover testimage: add/modify DEFAULT_TEST_SUITES

- Add generic variables to reuse values in default test suites
- Add more default test suites variables
- Modify existing test suites to use generic vars when possible

[YOCTO #8410]

Alex Franco (2):
testimage.bbclass: add generic, image test suites testimage.bbclass: reuse generic test suites

 meta/classes/testimage.bbclass | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)
Signature · 1 line
2.6.2
author
#1 lore raw

PATCH v2 1/2 testimage.bbclass: add generic, image test suites

Add generic test suites MINTESTSUITE, NETTESTSUITE, DEVTESTSUITE to group common test suites.

Add DEFAULT_TEST_SUITES_pn- variables for:
* core-image-minimal-dev
* core-image-full-cmdline
* core-image-x11
* core-image-lsb
* core-image-lsb-dev

New default test suites use generic test suites.
Existing default test suites not modified.

[YOCTO #8410]

Signed-off-by Alex Franco <[email protected]>
---
 meta/classes/testimage.bbclass | 8 ++++++++
 1 file changed, 8 insertions(+)
meta/classes/testimage.bbclass +8 -0
index eed27be..791cce3 100644
@@ -33,12 +33,20 @@ TEST_EXPORT_DIR ?= "${TMPDIR}/testimage/${PN}"
 TEST_EXPORT_ONLY ?= "0"
 
 RPMTESTSUITE = "${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'smart rpm', '', d)}"
+MINTESTSUITE = "ping"
+NETTESTSUITE = "${MINTESTSUITE} ssh df date scp syslog"
+DEVTESTSUITE = "gcc kernelmodule ldd"
 
 DEFAULT_TEST_SUITES = "ping auto"
 DEFAULT_TEST_SUITES_pn-core-image-minimal = "ping"
+DEFAULT_TEST_SUITES_pn-core-image-minimal-dev = "${MINTESTSUITE}"
+DEFAULT_TEST_SUITES_pn-core-image-full-cmdline = "${NETTESTSUITE} perl python logrotate"
+DEFAULT_TEST_SUITES_pn-core-image-x11 = "${MINTESTSUITE}"
+DEFAULT_TEST_SUITES_pn-core-image-lsb = "${NETTESTSUITE} pam parselogs ${RPMTESTSUITE}"
 DEFAULT_TEST_SUITES_pn-core-image-sato = "ping ssh df connman syslog xorg scp date parselogs ${RPMTESTSUITE} \
     ${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'python', '', d)}"
 DEFAULT_TEST_SUITES_pn-core-image-sato-sdk = "ping ssh df connman syslog xorg scp date perl ldd gcc kernelmodule python parselogs ${RPMTESTSUITE}"
+DEFAULT_TEST_SUITES_pn-core-image-lsb-dev = "${NETTESTSUITE} pam perl python parselogs ${RPMTESTSUITE}"
 DEFAULT_TEST_SUITES_pn-core-image-lsb-sdk = "ping buildcvs buildiptables buildsudoku connman date df gcc kernelmodule ldd pam parselogs perl python scp ${RPMTESTSUITE} ssh syslog logrotate"
 DEFAULT_TEST_SUITES_pn-meta-toolchain = "auto"
Signature · 1 line
2.6.2
author
#2 lore raw

PATCH v2 2/2 testimage.bbclass: reuse generic test suites

In reply to Alex Franco

Modify existing default test suites to reuse the new generic test suites.

Related to [YOCTO #8410]

Signed-off-by Alex Franco <[email protected]>
---
 meta/classes/testimage.bbclass | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
meta/classes/testimage.bbclass +7 -5
index 791cce3..e77bb11 100644
@@ -37,17 +37,19 @@ MINTESTSUITE = "ping"
 NETTESTSUITE = "${MINTESTSUITE} ssh df date scp syslog"
 DEVTESTSUITE = "gcc kernelmodule ldd"
 
-DEFAULT_TEST_SUITES = "ping auto"
-DEFAULT_TEST_SUITES_pn-core-image-minimal = "ping"
+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"
 DEFAULT_TEST_SUITES_pn-core-image-x11 = "${MINTESTSUITE}"
 DEFAULT_TEST_SUITES_pn-core-image-lsb = "${NETTESTSUITE} pam parselogs ${RPMTESTSUITE}"
-DEFAULT_TEST_SUITES_pn-core-image-sato = "ping ssh df connman syslog xorg scp date parselogs ${RPMTESTSUITE} \
+DEFAULT_TEST_SUITES_pn-core-image-sato = "${NETTESTSUITE} connman xorg parselogs ${RPMTESTSUITE} \
     ${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'python', '', d)}"
-DEFAULT_TEST_SUITES_pn-core-image-sato-sdk = "ping ssh df connman syslog xorg scp date perl ldd gcc kernelmodule python parselogs ${RPMTESTSUITE}"
+DEFAULT_TEST_SUITES_pn-core-image-sato-sdk = "${NETTESTSUITE} connman xorg perl python \
+    ${DEVTESTSUITE} parselogs ${RPMTESTSUITE}"
 DEFAULT_TEST_SUITES_pn-core-image-lsb-dev = "${NETTESTSUITE} pam perl python parselogs ${RPMTESTSUITE}"
-DEFAULT_TEST_SUITES_pn-core-image-lsb-sdk = "ping buildcvs buildiptables buildsudoku connman date df gcc kernelmodule ldd pam parselogs perl python scp ${RPMTESTSUITE} ssh syslog logrotate"
+DEFAULT_TEST_SUITES_pn-core-image-lsb-sdk = "${NETTESTSUITE} buildcvs buildiptables buildsudoku \
+    connman ${DEVTESTSUITE} pam perl python parselogs ${RPMTESTSUITE}"
 DEFAULT_TEST_SUITES_pn-meta-toolchain = "auto"
 
 # aarch64 has no graphics
Signature · 1 line
2.6.2
#3 lore raw

Re: [PATCHv2 2/2] testimage.bbclass: reuse generic test suites

Hi Franco, how did you test this? what is the behavior you get with these defaults instead of how's behaving now?

See comments below.

Quoted 34 lines · Alex Franco

Modify existing default test suites to reuse the new generic test suites.

Related to [YOCTO #8410]

Signed-off-by Alex Franco <[email protected]>
---
 meta/classes/testimage.bbclass | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
meta/classes/testimage.bbclass +2 -2
index 791cce3..e77bb11 100644
@@ -37,17 +37,19 @@ MINTESTSUITE = "ping"
 NETTESTSUITE = "${MINTESTSUITE} ssh df date scp syslog"
 DEVTESTSUITE = "gcc kernelmodule ldd"
 
-DEFAULT_TEST_SUITES = "ping auto"
-DEFAULT_TEST_SUITES_pn-core-image-minimal = "ping"
+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"
DEFAULT_TEST_SUITES_pn-core-image-x11 = "${MINTESTSUITE}" DEFAULT_TEST_SUITES_pn-core-image-lsb = "${NETTESTSUITE} pam
parselogs ${RPMTESTSUITE}" -DEFAULT_TEST_SUITES_pn-core-image-sato = "ping ssh df connman syslog xorg scp date parselogs ${RPMTESTSUITE} \
+DEFAULT_TEST_SUITES_pn-core-image-sato = "${NETTESTSUITE} connman

xorg parselogs ${RPMTESTSUITE} \
     ${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'python', '', d)}"
Quoted 14 lines

-DEFAULT_TEST_SUITES_pn-core-image-sato-sdk = "ping ssh df connman syslog xorg scp date perl ldd gcc kernelmodule python parselogs ${RPMTESTSUITE}" +DEFAULT_TEST_SUITES_pn-core-image-sato-sdk = "${NETTESTSUITE} connman xorg perl python \
+ ${DEVTESTSUITE} parselogs ${RPMTESTSUITE}"
DEFAULT_TEST_SUITES_pn-core-image-lsb-dev = "${NETTESTSUITE} pam
perl python parselogs ${RPMTESTSUITE}" -DEFAULT_TEST_SUITES_pn-core-image-lsb-sdk = "ping buildcvs buildiptables buildsudoku connman date df gcc kernelmodule ldd pam parselogs perl python scp ${RPMTESTSUITE} ssh syslog logrotate" +DEFAULT_TEST_SUITES_pn-core-image-lsb-sdk = "${NETTESTSUITE} buildcvs buildiptables buildsudoku \
+ connman ${DEVTESTSUITE} pam perl python parselogs

These lots of declarations seem to be suited for a .inc file instead of living in the bbclass.

Quoted 7 lines

${RPMTESTSUITE}"
DEFAULT_TEST_SUITES_pn-meta-toolchain = "auto"

 # aarch64 has no graphics
Signature · 1 line
2.6.2
author
#4 lore raw

Re: [PATCHv2 2/2] testimage.bbclass: reuse generic test suites

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

I tested this with builds in my workstation and (local, internal) autobuilder, where TEST_SUITES is *not* specified in local.conf, so the TEST_SUITES are taken from the DEFAULT_TEST_SUITES variable for each image, which makes the tests work for the variables defined.

If TEST_SUITES includes "auto", then the testimage task for some images will still fail, but that's why I opened a new bug # 9129

- - Alex Franco

Quoted 49 lines · Benjamin Esquivel

Hi Franco, how did you test this? what is the behavior you get with these defaults instead of how's behaving now?

See comments below.

Quoted 43 lines · Alex Franco

Modify existing default test suites to reuse the new generic test suites.

Related to [YOCTO #8410]

Signed-off-by Alex Franco <[email protected]>
---
 meta/classes/testimage.bbclass | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
meta/classes/testimage.bbclass +2 -2
index 791cce3..e77bb11 100644
@@ -37,17 +37,19 @@ MINTESTSUITE = "ping"
 NETTESTSUITE = "${MINTESTSUITE} ssh df date scp syslog"
 DEVTESTSUITE = "gcc kernelmodule ldd"
 
-DEFAULT_TEST_SUITES = "ping auto"
-DEFAULT_TEST_SUITES_pn-core-image-minimal = "ping"
+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"
DEFAULT_TEST_SUITES_pn-core-image-x11 = "${MINTESTSUITE}" DEFAULT_TEST_SUITES_pn-core-image-lsb = "${NETTESTSUITE} pam
parselogs ${RPMTESTSUITE}" -DEFAULT_TEST_SUITES_pn-core-image-sato = "ping ssh df connman syslog xorg scp date parselogs ${RPMTESTSUITE} \
+DEFAULT_TEST_SUITES_pn-core-image-sato = "${NETTESTSUITE} connman

xorg parselogs ${RPMTESTSUITE} \
     ${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'python', '', d)}"

-DEFAULT_TEST_SUITES_pn-core-image-sato-sdk = "ping ssh df connman syslog xorg scp date perl ldd gcc kernelmodule python parselogs ${RPMTESTSUITE}" +DEFAULT_TEST_SUITES_pn-core-image-sato-sdk = "${NETTESTSUITE} connman xorg perl python \
+ ${DEVTESTSUITE} parselogs ${RPMTESTSUITE}"
DEFAULT_TEST_SUITES_pn-core-image-lsb-dev = "${NETTESTSUITE} pam
perl python parselogs ${RPMTESTSUITE}" -DEFAULT_TEST_SUITES_pn-core-image-lsb-sdk = "ping buildcvs

Quoted 15 lines
Quoted 5 lines

buildiptables buildsudoku connman date df gcc kernelmodule ldd pam parselogs perl python scp ${RPMTESTSUITE} ssh syslog logrotate" +DEFAULT_TEST_SUITES_pn-core-image-lsb-sdk = "${NETTESTSUITE} buildcvs buildiptables buildsudoku \
+ connman ${DEVTESTSUITE} pam perl python parselogs

These lots of declarations seem to be suited for a .inc file instead of living in the bbclass.

Quoted 7 lines

${RPMTESTSUITE}"
DEFAULT_TEST_SUITES_pn-meta-toolchain = "auto"

 # aarch64 has no graphics
--
2.6.2

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQEcBAEBAgAGBQJWzNqsAAoJEPR9uwMY2lTL9ecH/RQag7augvPCsjKCIdDVAV/C +PW1JgLwLz1ox9TU7fbVICrXPpBLu/a1tGawstqcvLW2mrlzDy7wJ3Vd1pIhkXTV zqby90ziqPL9eyeYBnCSv5vyttbB4D8WqY7bf+yC7WAhCB0iXiWjHpjsGFwCyolc V4gaJGUI1Uv6h7DBQTLoVxTENHFLiLmGqrf3dn6O26EGs9wJlH5rKDnKD6sctCrH A0w7EWMsBNVPlRFFstBreTX/0SEStU9HsaAUo0bQrwe6ZRZ0Ku0zT9fj9YVdRXxL BXcVMbv6v/TSut7Ah41LWCCcwmjT6XhJZStuiq7zTRwHufAYQNBPVAPMGdW55YM= =2lA5
-----END PGP SIGNATURE-----

#5 lore raw

Re: [PATCHv2 2/2] testimage.bbclass: reuse generic test suites

Quoted 10 lines · Alex Franco

I tested this with builds in my workstation and (local, internal) autobuilder, where TEST_SUITES is *not* specified in local.conf, so the
TEST_SUITES are taken from the DEFAULT_TEST_SUITES variable for each image, which makes the tests work for the variables defined.

If TEST_SUITES includes "auto", then the testimage task for some images
will still fail, but that's why I opened a new bug # 9129

Thanks, good info.

Quoted 76 lines

- Alex Franco

Quoted 72 lines · Benjamin Esquivel

Hi Franco, how did you test this? what is the behavior you get with these defaults instead of how's behaving now?

See comments below.

Quoted 47 lines · Alex Franco

Modify existing default test suites to reuse the new generic test suites.

Related to [YOCTO #8410]

Signed-off-by Alex Franco <[email protected]>
---
 meta/classes/testimage.bbclass | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
meta/classes/testimage.bbclass +2 -2
index 791cce3..e77bb11 100644
@@ -37,17 +37,19 @@ MINTESTSUITE = "ping"
 NETTESTSUITE = "${MINTESTSUITE} ssh df date scp syslog"
 DEVTESTSUITE = "gcc kernelmodule ldd"
 
-DEFAULT_TEST_SUITES = "ping auto"
-DEFAULT_TEST_SUITES_pn-core-image-minimal = "ping"
+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"
DEFAULT_TEST_SUITES_pn-core-image-x11 = "${MINTESTSUITE}" DEFAULT_TEST_SUITES_pn-core-image-lsb = "${NETTESTSUITE} pam
parselogs ${RPMTESTSUITE}" -DEFAULT_TEST_SUITES_pn-core-image-sato = "ping ssh df connman syslog
xorg scp date parselogs ${RPMTESTSUITE} \
+DEFAULT_TEST_SUITES_pn-core-image-sato = "${NETTESTSUITE} connman

xorg parselogs ${RPMTESTSUITE} \
     ${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'python', '',

d)}"
-DEFAULT_TEST_SUITES_pn-core-image-sato-sdk = "ping ssh df connman
syslog xorg scp date perl ldd gcc kernelmodule python parselogs ${RPMTESTSUITE}" +DEFAULT_TEST_SUITES_pn-core-image-sato-sdk = "${NETTESTSUITE} connman xorg perl python \
+ ${DEVTESTSUITE} parselogs ${RPMTESTSUITE}"
DEFAULT_TEST_SUITES_pn-core-image-lsb-dev = "${NETTESTSUITE} pam

Quoted 8 lines

perl python parselogs ${RPMTESTSUITE}" -DEFAULT_TEST_SUITES_pn-core-image-lsb-sdk = "ping buildcvs buildiptables buildsudoku connman date df gcc kernelmodule ldd pam
parselogs perl python scp ${RPMTESTSUITE} ssh syslog logrotate" +DEFAULT_TEST_SUITES_pn-core-image-lsb-sdk = "${NETTESTSUITE} buildcvs buildiptables buildsudoku \
+ connman ${DEVTESTSUITE} pam perl python parselogs

These lots of declarations seem to be suited for a .inc file instead of
living in the bbclass.

Quoted 7 lines

${RPMTESTSUITE}"
DEFAULT_TEST_SUITES_pn-meta-toolchain = "auto"

 # aarch64 has no graphics
--
2.6.2