From abdd8e708d5fd9bc1491fd041bd2072f57d9bec0 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Wed, 30 Apr 2014 13:32:01 +0100 Subject: [PATCH] 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 Signed-off-by: Richard Purdie --- meta/classes/testimage.bbclass | 2 +- meta/lib/oeqa/targetcontrol.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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):