]> code.ossystems Code Review - openembedded-core.git/commitdiff
oeqa: qemu: ensure that host dump commands can be run properly
authorPaul Eggleton <paul.eggleton@linux.intel.com>
Mon, 9 Dec 2019 10:59:05 +0000 (23:59 +1300)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 15 Dec 2019 09:04:38 +0000 (09:04 +0000)
If runqemu fails, there is some logic to run a set of commands to dump
various bits of information that might help debug the issue
(particularly in a busy situation such as on the autobuilder). However,
when we try to run these we are inside the normal build environment
which restricts commands to be run on the host to those specified in
HOSTTOOLS. Since this isn't a place where host contamination is going to
be a problem, override PATH to a reasonable default so that we run the
actual host tools directly to avoid the issue. (Logically we would want
to use the original PATH value here, but it is not easily accessible.)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/lib/oeqa/utils/dump.py

index d34e05e2b4bdb5b229e09e994aefe5870e0bff68..6594e286a492ad59ceb7bf2df7633885ecba11e0 100644 (file)
@@ -71,8 +71,10 @@ class HostDumper(BaseDumper):
     def dump_host(self, dump_dir=""):
         if dump_dir:
             self.dump_dir = dump_dir
+        env = os.environ.copy()
+        env['PATH'] = '/usr/sbin:/sbin:/usr/bin:/bin'
         for cmd in self.cmds:
-            result = runCmd(cmd, ignore_status=True)
+            result = runCmd(cmd, ignore_status=True, env=env)
             self._write_dump(cmd.split()[0], result.output)
 
 class TargetDumper(BaseDumper):