From da6930c6f4652fd32062e8f2942a28353cd710f9 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 31 Mar 2022 19:29:04 +0100 Subject: 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 Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/classes/testimage.bbclass | 4 ++-- 1 file 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): import shutil from bb.utils import export_proxies - from oeqa.core.utils.misc import updateTestData from oeqa.runtime.context import OERuntimeTestContext from oeqa.runtime.context import OERuntimeTestContextExecutor from oeqa.core.target.qemu import supported_fstypes @@ -245,7 +244,8 @@ def testimage_main(d): # Some variables need to be updates (mostly paths) with the # ones of the current environment because some tests require them. - updateTestData(d, td, d.getVar('TESTIMAGE_UPDATE_VARS').split()) + for var in d.getVar('TESTIMAGE_UPDATE_VARS').split(): + td[var] = d.getVar(var) image_manifest = "%s.manifest" % image_name image_packages = OERuntimeTestContextExecutor.readPackagesManifest(image_manifest) -- cgit v1.2.3-54-g00ecf