Advertisement
Guest User

Untitled

a guest
Feb 11th, 2016
61
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.68 KB | None | 0 0
  1. diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py
  2. index 263e42c..8b3e8d3 100644
  3. --- a/meta/lib/oeqa/selftest/wic.py
  4. +++ b/meta/lib/oeqa/selftest/wic.py
  5. @@ -269,7 +269,7 @@ class Wic(oeSelfTest):
  6. """Test wic-image-minimal under qemu"""
  7. self.assertEqual(0, bitbake('wic-image-minimal').status)
  8.  
  9. - with runqemu('wic-image-minimal', ssh=False) as qemu:
  10. + with runqemu('wic-image-minimal', ssh=False, appendfiles=[self.testinc_path]) as qemu:
  11. command = "mount |grep '^/dev/' | cut -f1,3 -d ' '"
  12. status, output = qemu.run_serial(command)
  13. self.assertEqual(1, status, 'Failed to run command "%s": %s' % (command, output))
  14. diff --git a/meta/lib/oeqa/utils/commands.py b/meta/lib/oeqa/utils/commands.py
  15. index 32e001c..32fe7d6 100644
  16. --- a/meta/lib/oeqa/utils/commands.py
  17. +++ b/meta/lib/oeqa/utils/commands.py
  18. @@ -178,7 +178,7 @@ def create_temp_layer(templayerdir, templayername, priority=999, recipepathspec=
  19.  
  20.  
  21. @contextlib.contextmanager
  22. -def runqemu(pn, ssh=True):
  23. +def runqemu(pn, ssh=True, appendfiles=None):
  24.  
  25. import bb.tinfoil
  26. import bb.build
  27. @@ -192,7 +192,7 @@ def runqemu(pn, ssh=True):
  28. tinfoil.config_data.setVar("TEST_QEMUBOOT_TIMEOUT", "1000")
  29. import oe.recipeutils
  30. recipefile = oe.recipeutils.pn_to_recipe(tinfoil.cooker, pn)
  31. - recipedata = oe.recipeutils.parse_recipe(recipefile, [], tinfoil.config_data)
  32. + recipedata = oe.recipeutils.parse_recipe(recipefile, appendfiles or [], tinfoil.config_data)
  33.  
  34. # The QemuRunner log is saved out, but we need to ensure it is at the right
  35. # 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