From 98c2bdbd558db289e30a175f9a5b1a3d2be0fa98 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 23 Jun 2015 12:13:02 +0100 Subject: 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. (From OE-Core rev: 210c8926405fcf695ec00f5768f29ba198320d6a) Signed-off-by: Richard Purdie Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/testimage.bbclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'meta/classes') diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass index 4074ff7c4e..ddacd1fa4d 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass @@ -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}" -- cgit v1.2.3-54-g00ecf