diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-08-26 15:00:19 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-09-01 16:27:09 +0100 |
commit | 4e28505e23cdc567376d00781f8fcae01cd6add2 (patch) | |
tree | e5d0fd87f72d7418e8f2e9033556ddc2cc9feb67 /meta/lib/oeqa | |
parent | b90687ad24d29e91617a04f770b46f6833a6c666 (diff) | |
download | poky-4e28505e23cdc567376d00781f8fcae01cd6add2.tar.gz |
qemurunner.py: handle getOutput() having nothing to read
(From OE-Core rev: 6f3a8e259ecf6934b32a264661422a6872aca2ef)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit f4abfdeea175cfcadd6f73a69a676632ab4334a6)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa')
-rw-r--r-- | meta/lib/oeqa/utils/qemurunner.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index a9efb849d9..f7e5a3b3a6 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py | |||
@@ -120,7 +120,10 @@ class QemuRunner: | |||
120 | import fcntl | 120 | import fcntl |
121 | fl = fcntl.fcntl(o, fcntl.F_GETFL) | 121 | fl = fcntl.fcntl(o, fcntl.F_GETFL) |
122 | fcntl.fcntl(o, fcntl.F_SETFL, fl | os.O_NONBLOCK) | 122 | fcntl.fcntl(o, fcntl.F_SETFL, fl | os.O_NONBLOCK) |
123 | return os.read(o.fileno(), 1000000).decode("utf-8") | 123 | try: |
124 | return os.read(o.fileno(), 1000000).decode("utf-8") | ||
125 | except BlockingIOError: | ||
126 | return "" | ||
124 | 127 | ||
125 | 128 | ||
126 | def handleSIGCHLD(self, signum, frame): | 129 | def handleSIGCHLD(self, signum, frame): |