1 files changed, 24 insertions, 1 deletions

diff --git a/meta/classes/imagetest-qemu.bbclass b/meta/classes/imagetest-qemu.bbclass
index 4ea86c04fe..e3a65f0419 100644
--- a/meta/classes/imagetest-qemu.bbclass
+++ b/meta/classes/imagetest-qemu.bbclass
@@ -80,9 +80,31 @@ def qemuimagetest_main(d):
         bb.note("Run %s test in scenario %s" % (case, scen))
         os.system("%s" % fulltestpath)
     
+    """function to check testcase list and remove inappropriate cases"""
+    def check_list(list):
+        final_list = []
+        for test in list:
+            (scen, case, fullpath) = test
+
+            """Skip rpm/zypper if package_rpm not set for PACKAGE_CLASSES"""
+            if case.find("zypper") != -1 or case.find("rpm") != -1:
+                if d.getVar("PACKAGE_CLASSES", True).find("rpm", 0, 11) == -1:
+                    bb.note("skip rpm/zypper cases since package_rpm not set in PACKAGE_CLASSES")
+                    continue
+                else:
+                    final_list.append((scen, case, fullpath))
+            else:
+                    final_list.append((scen, case, fullpath))
+
+        if not final_list:
+            raise bb.build.FuncFailed("There is no suitable testcase for this target")
+
+        return final_list
+
     """Generate testcase list in runtime"""
     def generate_list(testlist):
         list = []
+        final_list = []
         if len(testlist) == 0:
             raise bb.build.FuncFailed("No testcase defined in TEST_SCEN")
 
@@ -114,7 +136,8 @@ def qemuimagetest_main(d):
                        if not os.path.isfile(fulltestcase):
                             raise bb.build.FuncFailed("Testcase %s not found" % fulltestcase)
                        list.append((item, casefile, fulltestcase))
-        return list
+        final_list = check_list(list)
+        return final_list
 
     """Clean tmp folder for testing"""
     def clean_tmp():