Fix autocitest simics attempt numbering

wghoffa · Nicholas E. Bofferding · commit 8b9e2d415060 · 2019-03-14T09:59:17.000-05:00
- This will cause the script to error out rather than continue on after simics fails to start Change-Id: I99ea12b5bcbc2e238dbc2f949511ff9a95245638 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/73284 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com> Reviewed-by: Michael Baiocchi <mbaiocch@us.ibm.com> Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com>
diff --git a/src/build/citest/autocitest b/src/build/citest/autocitest
@@ -6,7 +6,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2011,2018
+# Contributors Listed Below - COPYRIGHT 2011,2019
 # [+] International Business Machines Corp.
 #
 #
@@ -191,8 +191,8 @@ echo "Attempting to start simics"
 
 #autosim $VERBOSE --startsim --chkpt standby <<< chkpt not working yet
 max_start_simics_attempts=5
-current_attempts=0
-while [ $current_attempts -lt $max_start_simics_attempts ]; do
+current_attempts=1
+while [ $current_attempts -le $max_start_simics_attempts ]; do
     echo "> Attempt $current_attempts/$max_start_simics_attempts to start simics"
     autosim $NOWIN $VERBOSE --startsim $NRE --notar
     if [ $? -ne 0 ] ; then
@@ -211,6 +211,8 @@ while [ $current_attempts -lt $max_start_simics_attempts ]; do
     ((current_attempts++))
 done
 
+
+
 waitkb
 
 # open simics telnet port

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`#`
`7`	`7`	`# OpenPOWER HostBoot Project`
`8`	`8`	`#`
`9`		`-# Contributors Listed Below - COPYRIGHT 2011,2018`
	`9`	`+# Contributors Listed Below - COPYRIGHT 2011,2019`
`10`	`10`	`# [+] International Business Machines Corp.`
`11`	`11`	`#`
`12`	`12`	`#`
`@@ -191,8 +191,8 @@ echo "Attempting to start simics"`
`191`	`191`
`192`	`192`	`#autosim $VERBOSE --startsim --chkpt standby <<< chkpt not working yet`
`193`	`193`	`max_start_simics_attempts=5`
`194`		`-current_attempts=0`
`195`		`-while [ $current_attempts -lt $max_start_simics_attempts ]; do`
	`194`	`+current_attempts=1`
	`195`	`+while [ $current_attempts -le $max_start_simics_attempts ]; do`
`196`	`196`	`echo "> Attempt $current_attempts/$max_start_simics_attempts to start simics"`
`197`	`197`	`autosim $NOWIN $VERBOSE --startsim $NRE --notar`
`198`	`198`	`if [ $? -ne 0 ] ; then`
`@@ -211,6 +211,8 @@ while [ $current_attempts -lt $max_start_simics_attempts ]; do`
`211`	`211`	`((current_attempts++))`
`212`	`212`	`done`
`213`	`213`
	`214`	`+`
	`215`	`+`
`214`	`216`	`waitkb`
`215`	`217`
`216`	`218`	`# open simics telnet port`