[oe-commits] [openembedded-core] 02/19: testimage: Handle ipk/deb packaging format tests correctly

[git at git.openembedded.org]

rpurdie pushed a commit to branch fido
in repository openembedded-core.

commit 961a9de0e918526bc8c880ea1d35db16b55f500a
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Tue Jun 23 12:13:02 2015 +0100

    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 at linuxfoundation.org>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
    Signed-off-by: Joshua Lock <joshua.g.lock at intel.com>
---
 meta/classes/testimage.bbclass | 6 ++++--
 1 file 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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.