]> code.ossystems Code Review - openembedded-core.git/commitdiff
oeqa/commands: Fix runqemu after tinfoil data connector changes
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 24 Mar 2020 11:58:10 +0000 (11:58 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 24 Mar 2020 16:39:42 +0000 (16:39 +0000)
Poking changes into config_data and expecting them to appear in the recipe
is a bad idea, place the data in recipedata directly instead.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/lib/oeqa/utils/commands.py

index dc1e286dacf51c8987dfec99afc7977f3b55037d..f1679875dc2f3bee3ca75e7a2b50d62154185f13 100644 (file)
@@ -315,15 +315,15 @@ def runqemu(pn, ssh=True, runqemuparams='', image_fstype=None, launch_cmd=None,
     try:
         tinfoil.logger.setLevel(logging.WARNING)
         import oeqa.targetcontrol
-        tinfoil.config_data.setVar("TEST_LOG_DIR", "${WORKDIR}/testimage")
-        tinfoil.config_data.setVar("TEST_QEMUBOOT_TIMEOUT", "1000")
+        recipedata = tinfoil.parse_recipe(pn)
+        recipedata.setVar("TEST_LOG_DIR", "${WORKDIR}/testimage")
+        recipedata.setVar("TEST_QEMUBOOT_TIMEOUT", "1000")
         # Tell QemuTarget() whether need find rootfs/kernel or not
         if launch_cmd:
-            tinfoil.config_data.setVar("FIND_ROOTFS", '0')
+            recipedata.setVar("FIND_ROOTFS", '0')
         else:
-            tinfoil.config_data.setVar("FIND_ROOTFS", '1')
+            recipedata.setVar("FIND_ROOTFS", '1')
 
-        recipedata = tinfoil.parse_recipe(pn)
         for key, value in overrides.items():
             recipedata.setVar(key, value)