From 11833f70024e9d1199b911734c0d385a423d0c73 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 23 Dec 2010 17:28:47 +0000 Subject: 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 --- scripts/qemuimage-testlib | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'scripts/qemuimage-testlib') diff --git a/scripts/qemuimage-testlib b/scripts/qemuimage-testlib index 79882d9ea..2c38b9413 100644 --- 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 -- cgit v1.2.3