summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa/utils/qemurunner.py
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2023-06-05 02:00:02 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-06-06 07:41:43 +0100
commit5eec70a456dc5a3b5f8a4c7dcb3d70e2f6668181 (patch)
treed2c1339c3fb564dfd9cded0b8b6204d17a1ba7d0 /meta/lib/oeqa/utils/qemurunner.py
parent5131819228bb9968a64b52afb6461681d1090b5c (diff)
downloadpoky-5eec70a456dc5a3b5f8a4c7dcb3d70e2f6668181.tar.gz
qemurunner.py: fix error message about qmp
The error message is a little misleading as the qmp module is a directory with __init__.py file, not qmp.py file. Also, put the path where we try to import it from in the error message to make the message more indicative. (From OE-Core rev: 08bacbf797f6a50ae8abe8fc3455b3a15a0a94b3) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/utils/qemurunner.py')
-rw-r--r--meta/lib/oeqa/utils/qemurunner.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py
index 7f520d47c3..0ef8cf0a79 100644
--- a/meta/lib/oeqa/utils/qemurunner.py
+++ b/meta/lib/oeqa/utils/qemurunner.py
@@ -188,7 +188,7 @@ class QemuRunner:
188 def launch(self, launch_cmd, get_ip = True, qemuparams = None, extra_bootparams = None, env = None): 188 def launch(self, launch_cmd, get_ip = True, qemuparams = None, extra_bootparams = None, env = None):
189 # use logfile to determine the recipe-sysroot-native path and 189 # use logfile to determine the recipe-sysroot-native path and
190 # then add in the site-packages path components and add that 190 # then add in the site-packages path components and add that
191 # to the python sys.path so qmp.py can be found. 191 # to the python sys.path so the qmp module can be found.
192 python_path = os.path.dirname(os.path.dirname(self.logfile)) 192 python_path = os.path.dirname(os.path.dirname(self.logfile))
193 python_path += "/recipe-sysroot-native/usr/lib/qemu-python" 193 python_path += "/recipe-sysroot-native/usr/lib/qemu-python"
194 sys.path.append(python_path) 194 sys.path.append(python_path)
@@ -196,7 +196,7 @@ class QemuRunner:
196 try: 196 try:
197 qmp = importlib.import_module("qmp") 197 qmp = importlib.import_module("qmp")
198 except Exception as e: 198 except Exception as e:
199 self.logger.error("qemurunner: qmp.py missing, please ensure it's installed (%s)" % str(e)) 199 self.logger.error("qemurunner: qmp module missing, please ensure it's installed in %s (%s)" % (python_path, str(e)))
200 return False 200 return False
201 # Path relative to tmpdir used as cwd for qemu below to avoid unix socket path length issues 201 # Path relative to tmpdir used as cwd for qemu below to avoid unix socket path length issues
202 qmp_file = "." + next(tempfile._get_candidate_names()) 202 qmp_file = "." + next(tempfile._get_candidate_names())