summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2021-08-26 13:00:19 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-27 10:54:34 (GMT)
commitecf879551965cb625aeca648754c6061707cb40b (patch)
treed75d53d0b136b3e04c022b71a1516dccf491c359 /meta/lib
parente4aa695cea827572d77f4e25947e5b967848d46c (diff)
downloadpoky-ecf879551965cb625aeca648754c6061707cb40b.tar.gz
qemurunner.py: handle getOutput() having nothing to read
(From OE-Core rev: f4abfdeea175cfcadd6f73a69a676632ab4334a6) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oeqa/utils/qemurunner.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py
index 204ad8b..d55248c 100644
--- a/meta/lib/oeqa/utils/qemurunner.py
+++ b/meta/lib/oeqa/utils/qemurunner.py
@@ -123,7 +123,10 @@ class QemuRunner:
123 import fcntl 123 import fcntl
124 fl = fcntl.fcntl(o, fcntl.F_GETFL) 124 fl = fcntl.fcntl(o, fcntl.F_GETFL)
125 fcntl.fcntl(o, fcntl.F_SETFL, fl | os.O_NONBLOCK) 125 fcntl.fcntl(o, fcntl.F_SETFL, fl | os.O_NONBLOCK)
126 return os.read(o.fileno(), 1000000).decode("utf-8") 126 try:
127 return os.read(o.fileno(), 1000000).decode("utf-8")
128 except BlockingIOError:
129 return ""
127 130
128 131
129 def handleSIGCHLD(self, signum, frame): 132 def handleSIGCHLD(self, signum, frame):