summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-23 12:13:02 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-26 14:08:02 +0100
commit210c8926405fcf695ec00f5768f29ba198320d6a (patch)
tree779a0cae9223b9ad222703fea2d526a023f70d77 /meta
parent0ffc5c38ef28605abf815a47eb41923802d31df7 (diff)
downloadopenembedded-core-210c8926405fcf695ec00f5768f29ba198320d6a.tar.gz
openembedded-core-210c8926405fcf695ec00f5768f29ba198320d6a.tar.bz2
openembedded-core-210c8926405fcf695ec00f5768f29ba198320d6a.zip
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 <richard.purdie@linuxfoundation.org> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/testimage.bbclass6
1 files changed, 4 insertions, 2 deletions
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}"