summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross@burtonini.com>2022-03-31 19:29:04 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-04-01 23:05:31 +0100
commit2dfe2f68307a441fff2f5018408558bca63f7d03 (patch)
tree7cac3fe9019dddd26fe1ddb6da5468aac01ef9fa
parent54210c518bcb76d80c8ec9564d1ddf344e9d8924 (diff)
downloadopenembedded-core-contrib-2dfe2f68307a441fff2f5018408558bca63f7d03.tar.gz
testimage: inline updateTestData()
updateTestData() is just a simple loop that is only used here, so just inline it. Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
-rw-r--r--meta/classes/testimage.bbclass4
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):
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)