Edit cxxtest.start.sh script to call runsim correctly

Simserver has made changes for Axone to account for the new style
to the simics directory. start_simics is not longer a valid way
to start simics in the new directory so we must provide the new
command to start simics via the env var START_SIMICS_CMD and adding
the simics directory to the current path variable.

Change-Id: I8a9f259356a4125e22831585e69840c554261b36
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/74778
Tested-by: FSP CI Jenkins <fsp-CI-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>
Reviewed-by: Matt Derksen <mderkse1@us.ibm.com>
Reviewed-by: Corey V. Swenson <cswenson@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

2 files changed, 23 insertions, 3 deletions

diff --git a/src/build/citest/create-sandbox b/src/build/citest/create-sandbox
index 7e20ec372..0018e4422 100755
--- a/src/build/citest/create-sandbox
+++ b/src/build/citest/create-sandbox
@@ -73,8 +73,20 @@ fi
 
 # Run start_simics to populate simics directories.
 echo "----Setting up simics."
-execute_in_sandbox "start_simics -no_start -machine $MACHINE -batch_mode" \
-                   "ppc" || exit -1
+
+if [ "$MACHINE" != "NIMBUS" ] && [ "$MACHINE" != "CUMULUS" ] && \
+   [ "$MACHINE" != "CUMULUS_CDIMM" ] && [ "$MACHINE" != "FSPBUILD" ];
+then
+    SIMICS_LEVEL=`cat ${PROJECT_ROOT}/src/build/citest/etc/simbuild`
+    echo "mkdir -p ${SANDBOXBASE}/simics"
+    execute_in_sandbox "mkdir -p ${SANDBOXBASE}/simics" "ppc"
+    echo "tar ${SIMICS_LEVEL}  -C ${SANDBOXBASE}/simics/"
+    execute_in_sandbox "tar -xf ${SIMICS_LEVEL} -C ${SANDBOXBASE}/simics/" "ppc"
+    execute_in_sandbox "cd ${SANDBOXBASE}/simics/ && ./INSTALL.sh" "ppc"
+else
+    execute_in_sandbox "start_simics -no_start -machine $MACHINE -batch_mode" \
+                      "ppc" || exit -1
+fi
 
 # Run postsimsetup workarounds.
 echo "----Running postsimsetup workarounds."
diff --git a/src/build/citest/cxxtest-start.sh b/src/build/citest/cxxtest-start.sh
index d1fbc4f85..dcb25c201 100755
--- a/src/build/citest/cxxtest-start.sh
+++ b/src/build/citest/cxxtest-start.sh
@@ -6,7 +6,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2011,2015
+# Contributors Listed Below - COPYRIGHT 2011,2019
 # [+] International Business Machines Corp.
 #
 #
@@ -33,6 +33,14 @@ fi
 
 HOSTBOOT_IMAGE=img/hbicore_test.bin
 
+# do not set this for anything prior to axone
+if [ "$MACHINE" != "NIMBUS" ] && [ "$MACHINE" != "CUMULUS" ] && \
+   [ "$MACHINE" != "CUMULUS_CDIMM" ] && [ "$MACHINE" != "FSPBUILD" ];
+then
+    export PATH=$PATH:$SANDBOXBASE/simics/
+    export START_SIMICS_CMD="runsim -m $MACHINE hb_script_to_run=$SANDBOXBASE/obj/ppc/simu/scripts/hbfw/startup.simics pnor_img=$SANDBOXBASE/obj/ppc/hbfw/img/axone.pnor sbe_seeprom_img=$SANDBOXBASE/images/ppc/lab/flash/sbe_seeprom_p9a_10.bin.ecc num_procs=1 vpd_proc=vpd/images/99a8c3fe4e5c74798f5bd4212f3d9a2a"
+fi
+
 #   Front end to autocitest - script to execute unit tests under simics.
 #
 ##  when jenkins runs it will create a workspace with the built code tree