qemuimage-testlib-pythonhelper: Make the process detection more strict

PATCH New Richard Purdie 1 participant 1 message Apr 25, 2013

Share & tools

Richard Purdie

author

2013-04-25 10:33 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---

scripts/qemuimage-testlib-pythonhelper +2 -1

index 4e6432b..6435dd8 100755
@@ -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)