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:11:41 -0700
commitcdf447333243c0f683470b395eac1e1f9b3dbce0 (patch)
treef7b1a97bf671e3b72326d328fffac72adf3f6541
parent724b83d141e33b1d870dbf8210a714a0b118bd04 (diff)
downloadpoky-cdf447333243c0f683470b395eac1e1f9b3dbce0.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). (From OE-Core rev: 1117d25fdfabbf1afdc7030e05efc6a32df871e3) 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:
133 if data: 133 if data:
134 self.log(data) 134 self.log(data)
135 self.bootlog += data 135 self.bootlog += data
136 lastlines = "\n".join(self.bootlog.splitlines()[-2:]) 136 if re.search("qemu.* login:", self.bootlog):
137 if re.search("login:", lastlines):
138 stopread = True 137 stopread = True
139 reachedlogin = True 138 reachedlogin = True
140 bb.note("Reached login banner") 139 bb.note("Reached login banner")