testimage: Handle ipk/deb packaging format tests correctly

PATCH New Richard Purdie 1 participant 1 message Jun 23, 2015

lore

Share & tools

lore

Richard Purdie

author

2015-06-23 11:13 UTC #0 lore raw

PATCH 1/1 testimage: Handle ipk/deb packaging format tests correctly

The default test list only works for rpm packaging. This fixes it for deb and ipk too.

Signed-off-by Richard Purdie <[email protected]>

meta/classes/testimage.bbclass +4 -2

index 4074ff7..ddacd1f 100644
@@ -34,8 +34,10 @@ TEST_EXPORT_ONLY ?= "0"
 
 DEFAULT_TEST_SUITES = "ping auto"
 DEFAULT_TEST_SUITES_pn-core-image-minimal = "ping"
-DEFAULT_TEST_SUITES_pn-core-image-sato = "ping ssh df connman syslog xorg scp vnc date rpm smart dmesg python parselogs"
-DEFAULT_TEST_SUITES_pn-core-image-sato-sdk = "ping ssh df connman syslog xorg scp vnc date perl ldd gcc rpm smart kernelmodule dmesg python parselogs"
+DEFAULT_TEST_SUITES_pn-core-image-sato = "ping ssh df connman syslog xorg scp vnc date dmesg parselogs \
+    ${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'python smart rpm', '', d)}"
+DEFAULT_TEST_SUITES_pn-core-image-sato-sdk = "ping ssh df connman syslog xorg scp vnc date perl ldd gcc kernelmodule dmesg python parselogs \
+    ${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'smart rpm', '', d)}"
 DEFAULT_TEST_SUITES_pn-meta-toolchain = "auto"
 TEST_SUITES ?= "${DEFAULT_TEST_SUITES}"