diff options
author | Stefan Stanacar <stefanx.stanacar@intel.com> | 2014-03-07 14:20:07 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-11 08:11:41 -0700 |
commit | cdf447333243c0f683470b395eac1e1f9b3dbce0 (patch) | |
tree | f7b1a97bf671e3b72326d328fffac72adf3f6541 | |
parent | 724b83d141e33b1d870dbf8210a714a0b118bd04 (diff) | |
download | ast2050-yocto-poky-cdf447333243c0f683470b395eac1e1f9b3dbce0.zip ast2050-yocto-poky-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.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index 337b587..f1a7e24 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") |