From: Ross Burton Date: Thu, 31 Mar 2022 18:29:04 +0000 (+0100) Subject: testimage: inline updateTestData() X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~4555 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2dfe2f68307a441fff2f5018408558bca63f7d03;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git testimage: inline updateTestData() updateTestData() is just a simple loop that is only used here, so just inline it. Signed-off-by: Ross Burton Signed-off-by: Alexandre Belloni --- diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass index 898248992c8..8ffaeab2844 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)