summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-28 17:38:15 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-02 17:23:30 +0000
commit8a24f2d3b735bbc59ca4a09670cabbadb1868c1a (patch)
treef057f805d4d8ec5957288256e6b8aee8a9a1c0fb
parent7413e0fa4dca9571ea98f32dab87d4fd60bc8de9 (diff)
downloadbitbake-8a24f2d3b735bbc59ca4a09670cabbadb1868c1a.tar.gz
codeparser: Fix var_execs to append to execs, not references
When using the "execs" information in new code, it became clear that the returned data was incorrect and there were missing exec'd functions. This corrects the error and changes one of the test results to match the correct behaviour. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/codeparser.py2
-rw-r--r--lib/bb/tests/codeparser.py3
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/bb/codeparser.py b/lib/bb/codeparser.py
index 62b6cf9e3..a50b9f268 100644
--- a/lib/bb/codeparser.py
+++ b/lib/bb/codeparser.py
@@ -186,7 +186,7 @@ class PythonParser():
if n.__class__.__name__ == "Call":
self.visit_Call(n)
- self.references.update(self.var_execs)
+ self.execs.update(self.var_execs)
codeparsercache.pythoncacheextras[h] = {}
codeparsercache.pythoncacheextras[h]["refs"] = self.references
diff --git a/lib/bb/tests/codeparser.py b/lib/bb/tests/codeparser.py
index 938b04b2c..4454bc51e 100644
--- a/lib/bb/tests/codeparser.py
+++ b/lib/bb/tests/codeparser.py
@@ -236,7 +236,8 @@ be. These unit tests are testing snippets."""
self.d.setVar("do_something", "echo 'hi mom! ${FOO}'")
self.d.setVarFlag("do_something", etype, True)
self.parseExpression("bb.build.exec_func('do_something', d)")
- self.assertReferences(set(["do_something"]))
+ self.assertReferences(set([]))
+ self.assertExecs(set(["do_something"]))
def test_function_reference(self):
self.context["testfunc"] = lambda msg: bb.msg.note(1, None, msg)