From 4e28505e23cdc567376d00781f8fcae01cd6add2 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 26 Aug 2021 15:00:19 +0200 Subject: qemurunner.py: handle getOutput() having nothing to read (From OE-Core rev: 6f3a8e259ecf6934b32a264661422a6872aca2ef) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit f4abfdeea175cfcadd6f73a69a676632ab4334a6) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- meta/lib/oeqa/utils/qemurunner.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'meta') 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: import fcntl fl = fcntl.fcntl(o, fcntl.F_GETFL) fcntl.fcntl(o, fcntl.F_SETFL, fl | os.O_NONBLOCK) - return os.read(o.fileno(), 1000000).decode("utf-8") + try: + return os.read(o.fileno(), 1000000).decode("utf-8") + except BlockingIOError: + return "" def handleSIGCHLD(self, signum, frame): -- cgit v1.2.3-54-g00ecf