summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2020-07-01 13:50:10 +0800
committerSteve Sakoman <steve@sakoman.com>2020-07-06 14:33:20 -1000
commit80bdd59c8fa8b20a5a1fe7b5e3f1ddb95ad13af6 (patch)
tree82791fbd9b74b3d94d5ab640ff5c3b585fdfcb4a
parent9793d9b885195a1a917b2209b2bc8070a3df733d (diff)
downloadopenembedded-core-80bdd59c8fa8b20a5a1fe7b5e3f1ddb95ad13af6.tar.gz
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> (cherry picked from commit 17c89ad1596dbc7cefdd2c01dcd95aa9e93c5dc6) Signed-off-by: Steve Sakoman <steve@sakoman.com>
-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 f697d29b50..726daff7c6 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