aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2020-07-01 13:50:10 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-07-02 16:17:01 +0100
commit17c89ad1596dbc7cefdd2c01dcd95aa9e93c5dc6 (patch)
tree664d8b9ed8d386f92110b9068e441923811b1586
parent115d44958806a2c73d0bf140f45c11db462cc7db (diff)
downloadopenembedded-core-contrib-17c89ad1596dbc7cefdd2c01dcd95aa9e93c5dc6.tar.gz
openembedded-core-contrib-17c89ad1596dbc7cefdd2c01dcd95aa9e93c5dc6.tar.bz2
openembedded-core-contrib-17c89ad1596dbc7cefdd2c01dcd95aa9e93c5dc6.zip
oescripts: ignore whitespaces when comparing lines
list-packageconfig-flags.py determines the whitespace numbers according to the longest package name. This is reasonable for the tool as it's trying to generate pretty output. However, in this selftest case, the output is hardcoded. This results in "pinentry gtk2 libcap ncurses qt secret" not recognized as correct as the expected line is: "pinentry gtk2 libcap ncurses qt secret". The difference is only about whitespaces. So we should ignore the whitespaces when comparing lines. Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/selftest/cases/oescripts.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oeqa/selftest/cases/oescripts.py b/meta/lib/oeqa/selftest/cases/oescripts.py
index f697d29b500..726daff7c6e 100644
--- a/meta/lib/oeqa/selftest/cases/oescripts.py
+++ b/meta/lib/oeqa/selftest/cases/oescripts.py
@@ -133,7 +133,7 @@ class OEListPackageconfigTests(OEScriptTests):
def check_endlines(self, results, expected_endlines):
for line in results.output.splitlines():
for el in expected_endlines:
- if line == el:
+ if line.split() == el.split():
expected_endlines.remove(el)
break