summaryrefslogtreecommitdiffstats
path: root/scripts/qemuimage-testlib
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-12-23 17:28:47 (GMT)
committerRichard Purdie <rpurdie@linux.intel.com>2010-12-23 17:28:47 (GMT)
commit11833f70024e9d1199b911734c0d385a423d0c73 (patch)
tree73024559f38405ed59e71f04f2cabde05cd74bd9 /scripts/qemuimage-testlib
parentdf74cf25f0904562623a15b641a7770d2fa88570 (diff)
downloadpoky-11833f70024e9d1199b911734c0d385a423d0c73.tar.gz
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>
Diffstat (limited to 'scripts/qemuimage-testlib')
-rw-r--r--scripts/qemuimage-testlib8
1 files changed, 3 insertions, 5 deletions
diff --git a/scripts/qemuimage-testlib b/scripts/qemuimage-testlib
index 79882d9..2c38b94 100644
--- a/scripts/qemuimage-testlib
+++ b/scripts/qemuimage-testlib
@@ -204,8 +204,8 @@ Test_Kill_Qemu()
204# function to check if there is any qemu process 204# function to check if there is any qemu process
205Test_Check_Qemu_UP() 205Test_Check_Qemu_UP()
206{ 206{
207 local count=`ps -ef | grep -c qemu` 207 local count=`ps -eo command | cut -d " " -f 1 | grep -c \(^qemu\|.*/qemu\)`
208 if [ ${count} -lt 2 ]; then 208 if [ ${count} -lt 1 ]; then
209 Test_Info "There is no Qemu process" 209 Test_Info "There is no Qemu process"
210 return 1 210 return 1
211 else 211 else
@@ -402,9 +402,7 @@ Test_Create_Qemu()
402 # Get the pid of the xterm processor, which will be used in Test_Kill_Qemu 402 # Get the pid of the xterm processor, which will be used in Test_Kill_Qemu
403 PID=$! 403 PID=$!
404 404
405 sleep 5 405 while [ ${up_time} -lt 10 ]
406
407 while [ ${up_time} -lt ${timeout} ]
408 do 406 do
409 Test_Check_Qemu_UP 407 Test_Check_Qemu_UP
410 if [ $? -ne 0 ]; then 408 if [ $? -ne 0 ]; then