aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-23 12:13:02 +0100
committerJoshua Lock <joshua.g.lock@intel.com>2016-05-06 09:42:56 +0100
commit961a9de0e918526bc8c880ea1d35db16b55f500a (patch)
treeeffbe3a147642d260f4585457d55ca4348482c58
parent43f2cfdf63fb70e3c2da0224221dae63b05477df (diff)
downloadopenembedded-core-961a9de0e918526bc8c880ea1d35db16b55f500a.zip
openembedded-core-961a9de0e918526bc8c880ea1d35db16b55f500a.tar.gz
openembedded-core-961a9de0e918526bc8c880ea1d35db16b55f500a.tar.bz2
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 master rev: 210c8926405fcf695ec00f5768f29ba198320d6a) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
-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 606045b..b47c68f 100644
--- a/meta/classes/testimage.bbclass
+++ b/meta/classes/testimage.bbclass
@@ -30,8 +30,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"
# aarch64 has no graphics