From bd8e22ad58d2b775199b0609cf959aca9e47122d Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 5 Apr 2013 10:00:25 +0000 Subject: 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. (From OE-Core rev: 0c97fedc42fd9b53dc1dd40fe01f4ac142201269) Signed-off-by: Richard Purdie --- scripts/qemuimage-testlib-pythonhelper | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'scripts') 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) -- cgit v1.2.3-54-g00ecf