summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-01 06:38:08 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-01 09:10:41 +0100
commitfd6251ef548da7dbca354754cc0b666b2ccd0c45 (patch)
tree345dc29cc2b0d90da06694a521c588b26017bffd /meta
parent3309cf42d314f0a26079a11836c6b9b9bb5f253e (diff)
downloadpoky-fd6251ef548da7dbca354754cc0b666b2ccd0c45.tar.gz
imagetest-qemu.bbclass: Fix whitespace issues
(From OE-Core rev: 674d65c94478a1ff33ef9d9c1e49f677091301f4) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/imagetest-qemu.bbclass36
1 files changed, 18 insertions, 18 deletions
diff --git a/meta/classes/imagetest-qemu.bbclass b/meta/classes/imagetest-qemu.bbclass
index 7ece8868a1..ce20164d09 100644
--- a/meta/classes/imagetest-qemu.bbclass
+++ b/meta/classes/imagetest-qemu.bbclass
@@ -82,29 +82,29 @@ def qemuimagetest_main(d):
82 82
83 """function to check testcase list and remove inappropriate cases""" 83 """function to check testcase list and remove inappropriate cases"""
84 def check_list(list): 84 def check_list(list):
85 final_list = [] 85 final_list = []
86 for test in list: 86 for test in list:
87 (scen, case, fullpath) = test 87 (scen, case, fullpath) = test
88 88
89 """Skip rpm/zypper if package_rpm not set for PACKAGE_CLASSES""" 89 """Skip rpm/zypper if package_rpm not set for PACKAGE_CLASSES"""
90 if case.find("zypper") != -1 or case.find("rpm") != -1: 90 if case.find("zypper") != -1 or case.find("rpm") != -1:
91 if d.getVar("PACKAGE_CLASSES", True).find("rpm", 0, 11) == -1: 91 if d.getVar("PACKAGE_CLASSES", True).find("rpm", 0, 11) == -1:
92 bb.note("skip rpm/zypper cases since package_rpm not set in PACKAGE_CLASSES") 92 bb.note("skip rpm/zypper cases since package_rpm not set in PACKAGE_CLASSES")
93 continue 93 continue
94 else: 94 else:
95 final_list.append((scen, case, fullpath)) 95 final_list.append((scen, case, fullpath))
96 else: 96 else:
97 final_list.append((scen, case, fullpath)) 97 final_list.append((scen, case, fullpath))
98 98
99 if not final_list: 99 if not final_list:
100 raise bb.build.FuncFailed("There is no suitable testcase for this target") 100 raise bb.build.FuncFailed("There is no suitable testcase for this target")
101 101
102 return final_list 102 return final_list
103 103
104 """Generate testcase list in runtime""" 104 """Generate testcase list in runtime"""
105 def generate_list(testlist): 105 def generate_list(testlist):
106 list = [] 106 list = []
107 final_list = [] 107 final_list = []
108 if len(testlist) == 0: 108 if len(testlist) == 0:
109 raise bb.build.FuncFailed("No testcase defined in TEST_SCEN") 109 raise bb.build.FuncFailed("No testcase defined in TEST_SCEN")
110 110
@@ -136,7 +136,7 @@ def qemuimagetest_main(d):
136 if not os.path.isfile(fulltestcase): 136 if not os.path.isfile(fulltestcase):
137 raise bb.build.FuncFailed("Testcase %s not found" % fulltestcase) 137 raise bb.build.FuncFailed("Testcase %s not found" % fulltestcase)
138 list.append((item, casefile, fulltestcase)) 138 list.append((item, casefile, fulltestcase))
139 final_list = check_list(list) 139 final_list = check_list(list)
140 return final_list 140 return final_list
141 141
142 """Clean tmp folder for testing""" 142 """Clean tmp folder for testing"""
@@ -146,7 +146,7 @@ def qemuimagetest_main(d):
146 if os.path.isdir(tmppath): 146 if os.path.isdir(tmppath):
147 for f in os.listdir(tmppath): 147 for f in os.listdir(tmppath):
148 tmpfile = os.path.join(tmppath, f) 148 tmpfile = os.path.join(tmppath, f)
149 if os.path.isfile(tmpfile): 149 if os.path.isfile(tmpfile):
150 os.remove(tmpfile) 150 os.remove(tmpfile)
151 elif os.path.isdir(tmpfile): 151 elif os.path.isdir(tmpfile):
152 shutil.rmtree(tmpfile, True) 152 shutil.rmtree(tmpfile, True)