diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-05 10:00:25 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-05 11:13:30 +0100 |
| commit | fc914a6fb3204f8b5bdfc0f56364606673d5356a (patch) | |
| tree | f20f636ddcdbe52dd479773ef9764a8d9ea71f00 /scripts/qemuimage-testlib-pythonhelper | |
| parent | a864de0f2a326f857125229fc986845044931196 (diff) | |
| download | openembedded-core-fc914a6fb3204f8b5bdfc0f56364606673d5356a.tar.gz openembedded-core-fc914a6fb3204f8b5bdfc0f56364606673d5356a.tar.bz2 openembedded-core-fc914a6fb3204f8b5bdfc0f56364606673d5356a.zip | |
qemuimage-testlib-pythonhelper: Fix process mixups
runqemu-internal runs "ldd qemu-system xxx" and the detection code was returning this
as the PID of qemu. This patch improves the detection code to avoid this problem,
fixing certain race type failures on the autobuilder.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/qemuimage-testlib-pythonhelper')
| -rwxr-xr-x | scripts/qemuimage-testlib-pythonhelper | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/qemuimage-testlib-pythonhelper b/scripts/qemuimage-testlib-pythonhelper index bb01246c77..4e6432b0fe 100755 --- a/scripts/qemuimage-testlib-pythonhelper +++ b/scripts/qemuimage-testlib-pythonhelper @@ -3,6 +3,7 @@ import optparse import subprocess import sys +import os parser = optparse.OptionParser( usage = """ @@ -52,7 +53,10 @@ if options.findqemu: newparents = next #print "Children matching %s:" % str(parents) for p in parents: - if "qemu-system" in commands[p]: + # Need to be careful here since runqemu-internal runs "ldd qemu-system-xxxx" + basecmd = commands[p].split()[0] + basecmd = os.path.basename(basecmd) + if "qemu-system" in basecmd: print p sys.exit(0) sys.exit(1) |