aboutsummaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa/targetcontrol.py
diff options
context:
space:
mode:
authorPatrick Ohly <patrick.ohly@intel.com>2017-03-24 22:46:16 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-26 13:17:01 +0100
commitaccf0362f964cc9d6330b6e52e83d748d890521f (patch)
tree98e08d4a0956f378c35c0462e0a2aec1f29cb043 /meta/lib/oeqa/targetcontrol.py
parent680940250c9a1c7b43229c5e4f4fed5cc3e31033 (diff)
downloadopenembedded-core-contrib-accf0362f964cc9d6330b6e52e83d748d890521f.tar.gz
openembedded-core-contrib-accf0362f964cc9d6330b6e52e83d748d890521f.tar.bz2
openembedded-core-contrib-accf0362f964cc9d6330b6e52e83d748d890521f.zip
qemurunner: configurable timeout for run_serial()
Some commands might need to run longer than the default timeout of five seconds. If that occurred, run_serial() returned with a status code of zero (sic!) and no other indication of what went wrong. Now the timeout is configurable (with five still the default) and an explicit warning ("<<< run_serial(): command timed out after 5 seconds without output >>>") gets appended at the end of the data returned to the caller. While at it, the logic for checking for the timeout was updated a bit because both implementations could overshoot the timeout when entering select() right before the final deadline. Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/targetcontrol.py')
-rw-r--r--meta/lib/oeqa/targetcontrol.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oeqa/targetcontrol.py b/meta/lib/oeqa/targetcontrol.py
index 0ad3a6bf14..2f071e0901 100644
--- a/meta/lib/oeqa/targetcontrol.py
+++ b/meta/lib/oeqa/targetcontrol.py
@@ -206,8 +206,8 @@ class QemuTarget(BaseTarget):
else:
raise bb.build.FuncFailed("%s - FAILED to re-start qemu - check the task log and the boot log" % self.pn)
- def run_serial(self, command):
- return self.runner.run_serial(command)
+ def run_serial(self, command, timeout=5):
+ return self.runner.run_serial(command, timeout=timeout)
class SimpleRemoteTarget(BaseTarget):