mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 05:09:24 +00:00
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>
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user