summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorAníbal Limón <anibal.limon@linux.intel.com>2016-08-08 15:41:28 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-10 10:46:34 +0100
commit3ac3f3f30931881d1122e845d311921df07f2c51 (patch)
tree812e6ec1373526b6798184c0818aa97af848014c /meta/lib
parent4a4a24fccc4a4bdfb1d57f1a9f74866564fa8585 (diff)
downloadpoky-3ac3f3f30931881d1122e845d311921df07f2c51.tar.gz
oeqa: start() add remaining args SimpleRemoteTarget and QemuTinyRunner
Now Runner's support extra_bootargs for the kernel so add extra_bootparams to the start() methods to avoid exception. (From OE-Core rev: 4c28c03a2322fbcb9a5c268b08eaeb71d940ee04) Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oeqa/targetcontrol.py4
-rw-r--r--meta/lib/oeqa/utils/qemutinyrunner.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/meta/lib/oeqa/targetcontrol.py b/meta/lib/oeqa/targetcontrol.py
index d3b49b770a..768c463076 100644
--- a/meta/lib/oeqa/targetcontrol.py
+++ b/meta/lib/oeqa/targetcontrol.py
@@ -66,7 +66,7 @@ class BaseTarget(object, metaclass=ABCMeta):
66 bb.note("SSH log file: %s" % self.sshlog) 66 bb.note("SSH log file: %s" % self.sshlog)
67 67
68 @abstractmethod 68 @abstractmethod
69 def start(self, params=None, ssh=True): 69 def start(self, params=None, ssh=True, extra_bootparams=None):
70 pass 70 pass
71 71
72 @abstractmethod 72 @abstractmethod
@@ -230,7 +230,7 @@ class SimpleRemoteTarget(BaseTarget):
230 def deploy(self): 230 def deploy(self):
231 super(SimpleRemoteTarget, self).deploy() 231 super(SimpleRemoteTarget, self).deploy()
232 232
233 def start(self, params=None, ssh=True): 233 def start(self, params=None, ssh=True, extra_bootparams=None):
234 if ssh: 234 if ssh:
235 self.connection = SSHControl(self.ip, logfile=self.sshlog, port=self.port) 235 self.connection = SSHControl(self.ip, logfile=self.sshlog, port=self.port)
236 236
diff --git a/meta/lib/oeqa/utils/qemutinyrunner.py b/meta/lib/oeqa/utils/qemutinyrunner.py
index c823157ad6..7f7489de42 100644
--- a/meta/lib/oeqa/utils/qemutinyrunner.py
+++ b/meta/lib/oeqa/utils/qemutinyrunner.py
@@ -60,7 +60,7 @@ class QemuTinyRunner(QemuRunner):
60 with open(self.logfile, "a") as f: 60 with open(self.logfile, "a") as f:
61 f.write("%s" % msg) 61 f.write("%s" % msg)
62 62
63 def start(self, qemuparams = None): 63 def start(self, qemuparams = None, ssh=True, extra_bootparams=None):
64 64
65 if self.display: 65 if self.display:
66 os.environ["DISPLAY"] = self.display 66 os.environ["DISPLAY"] = self.display
@@ -167,4 +167,4 @@ class QemuTinyRunner(QemuRunner):
167 basecmd = commands[p].split()[0] 167 basecmd = commands[p].split()[0]
168 basecmd = os.path.basename(basecmd) 168 basecmd = os.path.basename(basecmd)
169 if "qemu-system" in basecmd and "-serial unix" in commands[p]: 169 if "qemu-system" in basecmd and "-serial unix" in commands[p]:
170 return [int(p),commands[p]] \ No newline at end of file 170 return [int(p),commands[p]]