summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2018-06-01 13:03:05 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-02 11:41:25 +0100
commitd83cda97dfc66e8c69e6bb23edad100a7cb43bf3 (patch)
tree32b5cbf0f876d42d06c74a16a0a79d6f614faa79
parente8f0fbad1c00cf6f2cf98ab7685f8eb08492c0a6 (diff)
downloadpoky-d83cda97dfc66e8c69e6bb23edad100a7cb43bf3.tar.gz
oeqa/core/decorator/data.py: fix skipIfNotInDataVar
The var might not be set, resulting in unexpected error. RESULTS - multilib.MultilibTest.test_check_multilib_libc - Testcase 1593: ERROR The above error is due to MULTILIBS being not set, which is the default for OE. This patch fixes this problem. Also, the debugging message in skipIfNotInDataVar is currently confusing. Instead of DEBUG: Checking if 'MULTILIBS' value is in 'multilib:lib32' to run the test it should be DEBUG: Checking if 'MULTILIBS' value contains 'multilib:lib32' to run the test This patch also fixes it. (From OE-Core rev: 3f5c678664a2bba43d99508779dc2ce227cf52a2) (From OE-Core rev: ea84439d42b578237d03d876992511eec73c5511) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/core/decorator/data.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oeqa/core/decorator/data.py b/meta/lib/oeqa/core/decorator/data.py
index ff7bdd98b7..31c6dd6be7 100644
--- a/meta/lib/oeqa/core/decorator/data.py
+++ b/meta/lib/oeqa/core/decorator/data.py
@@ -61,10 +61,10 @@ class skipIfNotInDataVar(OETestDecorator):
61 61
62 attrs = ('var', 'value', 'msg') 62 attrs = ('var', 'value', 'msg')
63 def setUpDecorator(self): 63 def setUpDecorator(self):
64 msg = ('Checking if %r value is in %r to run ' 64 msg = ('Checking if %r value contains %r to run '
65 'the test' % (self.var, self.value)) 65 'the test' % (self.var, self.value))
66 self.logger.debug(msg) 66 self.logger.debug(msg)
67 if not self.value in self.case.td.get(self.var): 67 if not self.value in (self.case.td.get(self.var) or ""):
68 self.case.skipTest(self.msg) 68 self.case.skipTest(self.msg)
69 69
70@registerDecorator 70@registerDecorator