diff options
author | Ross Burton <ross@burtonini.com> | 2021-09-21 11:56:21 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-09-21 23:44:08 +0100 |
commit | 48587b5e638f54737d80c008ca0eb3fcdad4e339 (patch) | |
tree | bf497e27c82c994d016931de0374046850590d27 | |
parent | 7be05f5228a16904ec1f802439b44fa42650b571 (diff) | |
download | poky-48587b5e638f54737d80c008ca0eb3fcdad4e339.tar.gz |
oeqa/target/ssh: don't assume target_dumper is set
The target_dumper property is only set by the QemuTarget subclass, so
assign a default value and check it isn't None before calling it.
(From OE-Core rev: add36cf85380bf7dc5339a9d65f951923317440b)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/lib/oeqa/core/target/ssh.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/lib/oeqa/core/target/ssh.py b/meta/lib/oeqa/core/target/ssh.py index 923a223b25..f956a7744f 100644 --- a/meta/lib/oeqa/core/target/ssh.py +++ b/meta/lib/oeqa/core/target/ssh.py | |||
@@ -44,6 +44,7 @@ class OESSHTarget(OETarget): | |||
44 | self.ssh = self.ssh + [ '-p', port ] | 44 | self.ssh = self.ssh + [ '-p', port ] |
45 | self.scp = self.scp + [ '-P', port ] | 45 | self.scp = self.scp + [ '-P', port ] |
46 | self._monitor_dumper = None | 46 | self._monitor_dumper = None |
47 | self.target_dumper = None | ||
47 | 48 | ||
48 | def start(self, **kwargs): | 49 | def start(self, **kwargs): |
49 | pass | 50 | pass |
@@ -102,7 +103,8 @@ class OESSHTarget(OETarget): | |||
102 | if self.monitor_dumper: | 103 | if self.monitor_dumper: |
103 | self.monitor_dumper.dump_monitor() | 104 | self.monitor_dumper.dump_monitor() |
104 | if status == 255: | 105 | if status == 255: |
105 | self.target_dumper.dump_target() | 106 | if self.target_dumper: |
107 | self.target_dumper.dump_target() | ||
106 | if self.monitor_dumper: | 108 | if self.monitor_dumper: |
107 | self.monitor_dumper.dump_monitor() | 109 | self.monitor_dumper.dump_monitor() |
108 | return (status, output) | 110 | return (status, output) |