summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2014-04-30 13:32:01 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-30 21:52:32 +0100
commitabdd8e708d5fd9bc1491fd041bd2072f57d9bec0 (patch)
tree214105657c133f091f3889187fd1673ef1ce1bc6 /meta
parent74f2d8b013b3f548b546d46664256e7f4845791e (diff)
downloadpoky-abdd8e708d5fd9bc1491fd041bd2072f57d9bec0.tar.gz
classes/testimage: if start fails, don't try to stop
If we couldn't start the target, it doesn't make sense to try and stop it here since logically it shouldn't now be in any kind of "started" state. (It's the start function's job to clean up after itself if it fails - to that end, fix up the QemuTarget class so that it does.) (From OE-Core rev: 819ebddae6b78120e5e082423793ff988419b5c4) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/testimage.bbclass2
-rw-r--r--meta/lib/oeqa/targetcontrol.py1
2 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
index 691c7f6785..285c6a9d42 100644
--- a/meta/classes/testimage.bbclass
+++ b/meta/classes/testimage.bbclass
@@ -209,8 +209,8 @@ def testimage_main(d):
209 209
210 target.deploy() 210 target.deploy()
211 211
212 target.start()
212 try: 213 try:
213 target.start()
214 if export: 214 if export:
215 exportTests(d,tc) 215 exportTests(d,tc)
216 else: 216 else:
diff --git a/meta/lib/oeqa/targetcontrol.py b/meta/lib/oeqa/targetcontrol.py
index 02cb370f2e..ff1bb89176 100644
--- a/meta/lib/oeqa/targetcontrol.py
+++ b/meta/lib/oeqa/targetcontrol.py
@@ -124,6 +124,7 @@ class QemuTarget(BaseTarget):
124 self.server_ip = self.runner.server_ip 124 self.server_ip = self.runner.server_ip
125 self.connection = SSHControl(ip=self.ip, logfile=self.sshlog) 125 self.connection = SSHControl(ip=self.ip, logfile=self.sshlog)
126 else: 126 else:
127 self.stop()
127 raise bb.build.FuncFailed("%s - FAILED to start qemu - check the task log and the boot log" % self.pn) 128 raise bb.build.FuncFailed("%s - FAILED to start qemu - check the task log and the boot log" % self.pn)
128 129
129 def stop(self): 130 def stop(self):