diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2014-04-30 13:32:01 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-30 21:52:12 +0100 |
| commit | 819ebddae6b78120e5e082423793ff988419b5c4 (patch) | |
| tree | 48e370b5309af63bc3699e86e915fe4497970628 /meta | |
| parent | c2257fa50071e4704a8152b5f1d16f899b4bed98 (diff) | |
| download | openembedded-core-contrib-819ebddae6b78120e5e082423793ff988419b5c4.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.)
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.bbclass | 2 | ||||
| -rw-r--r-- | meta/lib/oeqa/targetcontrol.py | 1 |
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): target.deploy() + target.start() try: - target.start() if export: exportTests(d,tc) 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): self.server_ip = self.runner.server_ip self.connection = SSHControl(ip=self.ip, logfile=self.sshlog) else: + self.stop() raise bb.build.FuncFailed("%s - FAILED to start qemu - check the task log and the boot log" % self.pn) def stop(self): |