summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Stanacar <stefanx.stanacar@intel.com>2014-03-07 14:20:07 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-11 08:08:12 -0700
commit1117d25fdfabbf1afdc7030e05efc6a32df871e3 (patch)
tree219cc59d96f4880c19c9b21641c3c5ca0d2780bd
parent47d2049d13ab71e0310e9eedaf307d6c3e530b44 (diff)
downloadopenembedded-core-contrib-1117d25fdfabbf1afdc7030e05efc6a32df871e3.tar.gz
oeqa/utils/qemurunner: search for login string in the entire boot log
If some service is to spammy we might miss the login, so search in the entire log instead of just the last few lines. Use qemu in regex too (to avoid a login string from some service). Signed-off-by: Stefan Stanacar <stefanx.stanacar@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/utils/qemurunner.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py
index 337b5874b2..f1a7e24ab7 100644
--- a/meta/lib/oeqa/utils/qemurunner.py
+++ b/meta/lib/oeqa/utils/qemurunner.py
@@ -133,8 +133,7 @@ class QemuRunner:
if data:
self.log(data)
self.bootlog += data
- lastlines = "\n".join(self.bootlog.splitlines()[-2:])
- if re.search("login:", lastlines):
+ if re.search("qemu.* login:", self.bootlog):
stopread = True
reachedlogin = True
bb.note("Reached login banner")