瀏覽代碼

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>
Paul Eggleton 11 年之前
父節點
當前提交
abdd8e708d
共有 2 個文件被更改,包括 2 次插入1 次删除
  1. 1 1
      meta/classes/testimage.bbclass
  2. 1 0
      meta/lib/oeqa/targetcontrol.py

+ 1 - 1
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:

+ 1 - 0
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):