diff options
Diffstat (limited to 'meta/lib/oeqa')
-rw-r--r-- | meta/lib/oeqa/oetest.py | 3 | ||||
-rwxr-xr-x | meta/lib/oeqa/runexported.py | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/meta/lib/oeqa/oetest.py b/meta/lib/oeqa/oetest.py index 4224206546..4773bdd4d8 100644 --- a/meta/lib/oeqa/oetest.py +++ b/meta/lib/oeqa/oetest.py | |||
@@ -13,7 +13,6 @@ import inspect | |||
13 | import subprocess | 13 | import subprocess |
14 | import bb | 14 | import bb |
15 | from oeqa.utils.decorators import LogResults | 15 | from oeqa.utils.decorators import LogResults |
16 | from oeqa.targetcontrol import QemuTarget | ||
17 | from sys import exc_info, exc_clear | 16 | from sys import exc_info, exc_clear |
18 | 17 | ||
19 | def loadTests(tc, type="runtime"): | 18 | def loadTests(tc, type="runtime"): |
@@ -124,7 +123,7 @@ class oeRuntimeTest(oeTest): | |||
124 | if not exc_info() == (None, None, None): | 123 | if not exc_info() == (None, None, None): |
125 | exc_clear() | 124 | exc_clear() |
126 | #Only dump for QemuTarget | 125 | #Only dump for QemuTarget |
127 | if (isinstance(self.target, QemuTarget)): | 126 | if (type(self.target).__name__ == "QemuTarget"): |
128 | self.tc.host_dumper.create_dir(self._testMethodName) | 127 | self.tc.host_dumper.create_dir(self._testMethodName) |
129 | self.tc.host_dumper.dump_host() | 128 | self.tc.host_dumper.dump_host() |
130 | self.target.target_dumper.dump_target( | 129 | self.target.target_dumper.dump_target( |
diff --git a/meta/lib/oeqa/runexported.py b/meta/lib/oeqa/runexported.py index e1b6642ec2..96442b1b27 100755 --- a/meta/lib/oeqa/runexported.py +++ b/meta/lib/oeqa/runexported.py | |||
@@ -32,6 +32,7 @@ sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "oeqa")) | |||
32 | 32 | ||
33 | from oeqa.oetest import runTests | 33 | from oeqa.oetest import runTests |
34 | from oeqa.utils.sshcontrol import SSHControl | 34 | from oeqa.utils.sshcontrol import SSHControl |
35 | from oeqa.utils.dump import get_host_dumper | ||
35 | 36 | ||
36 | # this isn't pretty but we need a fake target object | 37 | # this isn't pretty but we need a fake target object |
37 | # for running the tests externally as we don't care | 38 | # for running the tests externally as we don't care |
@@ -118,11 +119,16 @@ def main(): | |||
118 | for key in loaded["target"].keys(): | 119 | for key in loaded["target"].keys(): |
119 | setattr(target, key, loaded["target"][key]) | 120 | setattr(target, key, loaded["target"][key]) |
120 | 121 | ||
122 | host_dumper = get_host_dumper(d) | ||
123 | host_dumper.parent_dir = loaded["host_dumper"]["parent_dir"] | ||
124 | host_dumper.cmds = loaded["host_dumper"]["cmds"] | ||
125 | |||
121 | tc = TestContext() | 126 | tc = TestContext() |
122 | setattr(tc, "d", d) | 127 | setattr(tc, "d", d) |
123 | setattr(tc, "target", target) | 128 | setattr(tc, "target", target) |
129 | setattr(tc, "host_dumper", host_dumper) | ||
124 | for key in loaded.keys(): | 130 | for key in loaded.keys(): |
125 | if key != "d" and key != "target": | 131 | if key != "d" and key != "target" and key != "host_dumper": |
126 | setattr(tc, key, loaded[key]) | 132 | setattr(tc, key, loaded[key]) |
127 | 133 | ||
128 | target.exportStart() | 134 | target.exportStart() |