[oe-commits] [openembedded-core] 12/12: testimage: Test fix

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

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

commit c9cfd8d74fa197bcf38c7e70d424589a4b71665a
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Mon Nov 12 13:28:54 2018 +0000

    testimage: Test fix
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/testimage.bbclass | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
index 4e94942..6b45771 100644
--- a/meta/classes/testimage.bbclass
+++ b/meta/classes/testimage.bbclass
@@ -41,9 +41,12 @@ TEST_EXTRACTED_DIR ?= "${TEST_NEEDED_PACKAGES_DIR}/extracted"
 TEST_PACKAGED_DIR ?= "${TEST_NEEDED_PACKAGES_DIR}/packaged"
 
 BASICTESTSUITE = "\
-    ping date df ssh scp python perl apt opkg gi ptest dnf rpm parselogs \
+    ping date df ssh scp python perl gi ptest parselogs \
     logrotate connman systemd oe_syslog pam stap ldd xorg kernelmodule gcc \
-    buildcpio buildlzip buildgalculator"
+    buildcpio buildlzip buildgalculator \
+    ${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'dnf rpm', '', d)} \
+    ${@bb.utils.contains('IMAGE_PKGTYPE', 'ipk', 'opkg', '', d)} \
+    ${@bb.utils.contains('IMAGE_PKGTYPE', 'deb', 'apt', '', d)}"
 
 DEFAULT_TEST_SUITES = "${BASICTESTSUITE}"
 

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