[oe-commits] Richard Purdie : qemuimage-testlib-pythonhelper: Fix process mixups

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: danny
Commit: 0c97fedc42fd9b53dc1dd40fe01f4ac142201269
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=0c97fedc42fd9b53dc1dd40fe01f4ac142201269

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Fri Apr  5 10:00:25 2013 +0000

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 at linuxfoundation.org>

---

 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 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)