summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-10-31 16:59:48 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-07 11:04:22 +0000
commit7aebaa4204c89a60db5e6a691672849fcb392010 (patch)
tree28af6682a3b0b5eed3cb276fa23aed1f0012153e /meta/lib
parente0b62c38ac03553964db48d431656f5c4b360fd4 (diff)
downloadpoky-7aebaa4204c89a60db5e6a691672849fcb392010.tar.gz
oe-selftest: devtool: fix error message in _test_recipe_contents()
If a variable is being set in the recipe when we've explicitly passed None as the value to _test_recipe_contents() indicating that it shouldn't be set at all, then we should be printing out the variable name in the assertion message but it seems like I forgot to do a substitution. Also include the value for informational purposes. (From OE-Core rev: 0dafcb158003fb13f82c266f607d9967fca321db) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oeqa/selftest/devtool.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oeqa/selftest/devtool.py b/meta/lib/oeqa/selftest/devtool.py
index 713f2c5d63..71d205c73f 100644
--- a/meta/lib/oeqa/selftest/devtool.py
+++ b/meta/lib/oeqa/selftest/devtool.py
@@ -44,7 +44,7 @@ class DevtoolBase(oeSelfTest):
44 if var and var in checkvars: 44 if var and var in checkvars:
45 needvalue = checkvars.pop(var) 45 needvalue = checkvars.pop(var)
46 if needvalue is None: 46 if needvalue is None:
47 self.fail('Variable %s should not appear in recipe') 47 self.fail('Variable %s should not appear in recipe, but value is being set to "%s"' % (var, value))
48 if isinstance(needvalue, set): 48 if isinstance(needvalue, set):
49 if var == 'LICENSE': 49 if var == 'LICENSE':
50 value = set(value.split(' & ')) 50 value = set(value.split(' & '))