summaryrefslogtreecommitdiffstats
path: root/meta/lib
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:18:03 +0100
commit3765bf48207bc2ee27376b943c1de18f5237c5da (patch)
tree6b185ede74390bde159cdf15fb1a68d809d45415 /meta/lib
parent48d17fd1d45d627131f87a6b9c153881d7c0e7ae (diff)
downloadpoky-3765bf48207bc2ee27376b943c1de18f5237c5da.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. (From OE-Core rev: 17c89ad1596dbc7cefdd2c01dcd95aa9e93c5dc6) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-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):
133 def check_endlines(self, results, expected_endlines): 133 def check_endlines(self, results, expected_endlines):
134 for line in results.output.splitlines(): 134 for line in results.output.splitlines():
135 for el in expected_endlines: 135 for el in expected_endlines:
136 if line == el: 136 if line.split() == el.split():
137 expected_endlines.remove(el) 137 expected_endlines.remove(el)
138 break 138 break
139 139