diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-25 11:15:26 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-29 14:43:50 +0100 |
| commit | 7b43151bb073f1f6f1fa5a31447b742127060909 (patch) | |
| tree | a15004a7093f60e197e7618e58908fe604e0b467 | |
| parent | ce92c707f26aff8f02021c757056af4ecddb315d (diff) | |
| download | openembedded-core-7b43151bb073f1f6f1fa5a31447b742127060909.tar.gz openembedded-core-7b43151bb073f1f6f1fa5a31447b742127060909.tar.bz2 openembedded-core-7b43151bb073f1f6f1fa5a31447b742127060909.zip | |
qemuimage-testlib-pythonhelper: Make the process detection more strict
Old versions of ldd (2.11) as run on some of the autobuilders end up running
commands like "LD_xxxx qemu-system-xxx" which this process detection code
would pick up and result in the wrong PID for qemu.
This changes the code to check for "192.168" in the command so we know
we're getting the correct one. This is less than ideal however we're
running out of options and resolves false negatives we see on the
autobuilder.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
| -rwxr-xr-x | scripts/qemuimage-testlib-pythonhelper | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/qemuimage-testlib-pythonhelper b/scripts/qemuimage-testlib-pythonhelper index 4e6432b0fe..6435dd8f18 100755 --- a/scripts/qemuimage-testlib-pythonhelper +++ b/scripts/qemuimage-testlib-pythonhelper @@ -54,9 +54,10 @@ if options.findqemu: #print "Children matching %s:" % str(parents) for p in parents: # Need to be careful here since runqemu-internal runs "ldd qemu-system-xxxx" + # Also, old versions of ldd (2.11) run "LD_XXXX qemu-system-xxxx" basecmd = commands[p].split()[0] basecmd = os.path.basename(basecmd) - if "qemu-system" in basecmd: + if "qemu-system" in basecmd and "192.168" in commands[p]: print p sys.exit(0) sys.exit(1) |