diff options
author | Ross Burton <ross@burtonini.com> | 2022-03-31 19:29:04 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-04-01 23:11:37 +0100 |
commit | da6930c6f4652fd32062e8f2942a28353cd710f9 (patch) | |
tree | f1230b25b475f12c22d66cb628fc957ea5259c16 | |
parent | ccc03581f5dd401492defffc9527663ae1c47456 (diff) | |
download | poky-da6930c6f4652fd32062e8f2942a28353cd710f9.tar.gz |
testimage: inline updateTestData()
updateTestData() is just a simple loop that is only used here, so just
inline it.
(From OE-Core rev: 2dfe2f68307a441fff2f5018408558bca63f7d03)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/testimage.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass index 898248992c..8ffaeab284 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass | |||
@@ -205,7 +205,6 @@ def testimage_main(d): | |||
205 | import shutil | 205 | import shutil |
206 | 206 | ||
207 | from bb.utils import export_proxies | 207 | from bb.utils import export_proxies |
208 | from oeqa.core.utils.misc import updateTestData | ||
209 | from oeqa.runtime.context import OERuntimeTestContext | 208 | from oeqa.runtime.context import OERuntimeTestContext |
210 | from oeqa.runtime.context import OERuntimeTestContextExecutor | 209 | from oeqa.runtime.context import OERuntimeTestContextExecutor |
211 | from oeqa.core.target.qemu import supported_fstypes | 210 | from oeqa.core.target.qemu import supported_fstypes |
@@ -245,7 +244,8 @@ def testimage_main(d): | |||
245 | 244 | ||
246 | # Some variables need to be updates (mostly paths) with the | 245 | # Some variables need to be updates (mostly paths) with the |
247 | # ones of the current environment because some tests require them. | 246 | # ones of the current environment because some tests require them. |
248 | updateTestData(d, td, d.getVar('TESTIMAGE_UPDATE_VARS').split()) | 247 | for var in d.getVar('TESTIMAGE_UPDATE_VARS').split(): |
248 | td[var] = d.getVar(var) | ||
249 | 249 | ||
250 | image_manifest = "%s.manifest" % image_name | 250 | image_manifest = "%s.manifest" % image_name |
251 | image_packages = OERuntimeTestContextExecutor.readPackagesManifest(image_manifest) | 251 | image_packages = OERuntimeTestContextExecutor.readPackagesManifest(image_manifest) |