summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-30 09:02:35 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-23 12:00:53 (GMT)
commit5d2b15f0681398c6fd585b3505093c688f17a6b3 (patch)
treea01fe50f4a3976c1177259f9fbc73d09e736bc8d
parent45e460d0846f0f660128dc06064b597ce40282b3 (diff)
downloadpoky-5d2b15f0681398c6fd585b3505093c688f17a6b3.tar.gz
qemuimage-testlib: Increase qemu startup timeouts
We are seeing timeouts on the autobuilder where qemu does start but the script doesn't appear to be able to detect it in time. This patch increases the timeouts since there seems little harm in doing so. (From OE-Core rev: 33a5980ac381409413712b9910ee9638b7958189) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/qemuimage-testlib5
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/qemuimage-testlib b/scripts/qemuimage-testlib
index 9aaf552..8fb2538 100755
--- a/scripts/qemuimage-testlib
+++ b/scripts/qemuimage-testlib
@@ -418,7 +418,7 @@ Test_Create_Qemu()
418 sleep 5 418 sleep 5
419 fi 419 fi
420 420
421 while [ ${up_time} -lt 10 ] 421 while [ ${up_time} -lt 30 ]
422 do 422 do
423 QEMUPID=`qemuimage-testlib-pythonhelper --findqemu $XTERMPID 2>/dev/null` 423 QEMUPID=`qemuimage-testlib-pythonhelper --findqemu $XTERMPID 2>/dev/null`
424 if [ $? -ne 0 ]; then 424 if [ $? -ne 0 ]; then
@@ -432,7 +432,7 @@ Test_Create_Qemu()
432 fi 432 fi
433 done 433 done
434 434
435 if [ ${up_time} == 10 ]; then 435 if [ ${up_time} == 30 ]; then
436 Test_Info "No qemu process appeared to start, exiting" 436 Test_Info "No qemu process appeared to start, exiting"
437 ps axww -O ppid 437 ps axww -O ppid
438 Test_Info "Process list dumped for debugging purposes" 438 Test_Info "Process list dumped for debugging purposes"
@@ -442,6 +442,7 @@ Test_Create_Qemu()
442 return 1 442 return 1
443 fi 443 fi
444 444
445 up_time=0
445 # Parse IP address of target from the qemu command line 446 # Parse IP address of target from the qemu command line
446 TARGET_IPADDR=`Test_Fetch_Target_IP $QEMUPID` 447 TARGET_IPADDR=`Test_Fetch_Target_IP $QEMUPID`
447 echo "Target IP is ${TARGET_IPADDR}" 448 echo "Target IP is ${TARGET_IPADDR}"