diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-12-13 20:07:09 +1300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-14 12:25:07 +0000 |
commit | 8f8a9ef66930ef8375050e80c751dab5ba024d83 (patch) | |
tree | 5aff939bf2af2f18a1c07c24315ae57c99720d9b /bitbake/lib/bb/tests | |
parent | f1f3a112a02aef2e7094b4700c9a7d341ee01275 (diff) | |
download | poky-8f8a9ef66930ef8375050e80c751dab5ba024d83.tar.gz |
bitbake: tinfoil: pass datastore to server when expanding python references
If you're expanding a value that refers to the value of a variable in
python code, we need to ensure that the datastore that gets used to get
the value of that variable is the client-side datastore and not just the
part of it that's on the server side. For example, suppose you are in
client code doing the following:
d.setVar('HELLO', 'there')
result = d.expand('${@d.getVar("HELLO", True)}')
result should be "there" but if the client part wasn't taken into
account, it would be whatever value HELLO had in the server portion of
the datastore (if any).
(Bitbake rev: cbc22a0a9aadc8606b927dbac0f1407ec2736b35)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/tests')
-rw-r--r-- | bitbake/lib/bb/tests/data.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/bitbake/lib/bb/tests/data.py b/bitbake/lib/bb/tests/data.py index 2bd481b5d7..a17245f90a 100644 --- a/bitbake/lib/bb/tests/data.py +++ b/bitbake/lib/bb/tests/data.py | |||
@@ -458,8 +458,11 @@ class Remote(unittest.TestCase): | |||
458 | return self.d.localkeys() | 458 | return self.d.localkeys() |
459 | def getVarHistory(self, name): | 459 | def getVarHistory(self, name): |
460 | return self.d.varhistory.variable(name) | 460 | return self.d.varhistory.variable(name) |
461 | def expandPythonRef(self, varname, expr): | 461 | def expandPythonRef(self, varname, expr, d): |
462 | varparse = bb.data_smart.VariableParse(varname, self.d) | 462 | localdata = self.d.createCopy() |
463 | for key in d.localkeys(): | ||
464 | localdata.setVar(d.getVar(key)) | ||
465 | varparse = bb.data_smart.VariableParse(varname, localdata) | ||
463 | return varparse.python_sub(expr) | 466 | return varparse.python_sub(expr) |
464 | def setVar(self, name, value): | 467 | def setVar(self, name, value): |
465 | self.d.setVar(name, value) | 468 | self.d.setVar(name, value) |
@@ -483,3 +486,6 @@ class Remote(unittest.TestCase): | |||
483 | # Test setVar on client side affects server | 486 | # Test setVar on client side affects server |
484 | d2.setVar('HELLO', 'other-world') | 487 | d2.setVar('HELLO', 'other-world') |
485 | self.assertEqual(d1.getVar('HELLO'), 'other-world') | 488 | self.assertEqual(d1.getVar('HELLO'), 'other-world') |
489 | # Test client side data is incorporated in python expansion (which is done on server) | ||
490 | d2.setVar('FOO', 'bar') | ||
491 | self.assertEqual(d2.expand('${@d.getVar("FOO")}'), 'bar') | ||