qemuimage-testlib: Fix the check for running qemu processes

Previously, any active command containing the word "qemu" including
in the command path would trigger a "success" result for detecting
the qemu process. This change fixes the check to search for commands
starting with "qemu" and ignores pathnames.

It also shortens the timeout for the qemu process to appear to 10
seconds. If it doesn't appear in that time there is always a problem.

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/scripts/qemuimage-testlib b/scripts/qemuimage-testlib
index 79882d9ea702f661df93257b61ec0467a04df0b4..2c38b9413b304c4a5c29948689b0893897a61f7d 100644 (file)
--- a/scripts/qemuimage-testlib
+++ b/scripts/qemuimage-testlib
@@ -204,8 +204,8 @@ Test_Kill_Qemu()
 # function to check if there is any qemu process
 Test_Check_Qemu_UP()
 {
-       local count=`ps -ef | grep -c qemu`
-       if [ ${count} -lt 2 ]; then
+       local count=`ps -eo command | cut -d " " -f 1 | grep -c \(^qemu\|.*/qemu\)`
+       if [ ${count} -lt 1 ]; then
                Test_Info "There is no Qemu process"
                return 1
        else
@@ -402,9 +402,7 @@ Test_Create_Qemu()
        # Get the pid of the xterm processor, which will be used in Test_Kill_Qemu
        PID=$!
 
-       sleep 5
-       
-       while [ ${up_time} -lt ${timeout} ]
+       while [ ${up_time} -lt 10 ]
        do
                Test_Check_Qemu_UP
                if [ $? -ne 0 ]; then