aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-05 10:00:25 +0000
committerRoss Burton <ross.burton@intel.com>2013-04-23 11:07:45 +0100
commit0c97fedc42fd9b53dc1dd40fe01f4ac142201269 (patch)
tree2a08d9dafffadd2953edc55e3037b12551715188
parentca638c858c74313146d1902a4981df3e9fad58ff (diff)
downloadopenembedded-core-0c97fedc42fd9b53dc1dd40fe01f4ac142201269.zip
openembedded-core-0c97fedc42fd9b53dc1dd40fe01f4ac142201269.tar.gz
openembedded-core-0c97fedc42fd9b53dc1dd40fe01f4ac142201269.tar.bz2
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>
-rwxr-xr-xscripts/qemuimage-testlib-pythonhelper6
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/qemuimage-testlib-pythonhelper b/scripts/qemuimage-testlib-pythonhelper
index bb01246..4e6432b 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)