Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py
- index 263e42c..8b3e8d3 100644
- --- a/meta/lib/oeqa/selftest/wic.py
- +++ b/meta/lib/oeqa/selftest/wic.py
- @@ -269,7 +269,7 @@ class Wic(oeSelfTest):
- """Test wic-image-minimal under qemu"""
- self.assertEqual(0, bitbake('wic-image-minimal').status)
- - with runqemu('wic-image-minimal', ssh=False) as qemu:
- + with runqemu('wic-image-minimal', ssh=False, appendfiles=[self.testinc_path]) as qemu:
- command = "mount |grep '^/dev/' | cut -f1,3 -d ' '"
- status, output = qemu.run_serial(command)
- self.assertEqual(1, status, 'Failed to run command "%s": %s' % (command, output))
- diff --git a/meta/lib/oeqa/utils/commands.py b/meta/lib/oeqa/utils/commands.py
- index 32e001c..32fe7d6 100644
- --- a/meta/lib/oeqa/utils/commands.py
- +++ b/meta/lib/oeqa/utils/commands.py
- @@ -178,7 +178,7 @@ def create_temp_layer(templayerdir, templayername, priority=999, recipepathspec=
- @contextlib.contextmanager
- -def runqemu(pn, ssh=True):
- +def runqemu(pn, ssh=True, appendfiles=None):
- import bb.tinfoil
- import bb.build
- @@ -192,7 +192,7 @@ def runqemu(pn, ssh=True):
- tinfoil.config_data.setVar("TEST_QEMUBOOT_TIMEOUT", "1000")
- import oe.recipeutils
- recipefile = oe.recipeutils.pn_to_recipe(tinfoil.cooker, pn)
- - recipedata = oe.recipeutils.parse_recipe(recipefile, [], tinfoil.config_data)
- + recipedata = oe.recipeutils.parse_recipe(recipefile, appendfiles or [], tinfoil.config_data)
- # The QemuRunner log is saved out, but we need to ensure it is at the right
- # log level (and then ensure that since it's a child of the BitBake logger,
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement