Update hb and autocitest scripts to support patching a simicsInfo file.

Also moving to simics build fi111013b700.42 and fips build b1018a_1143.760

Change-Id: Idc95909d1d2106f562e68ea645f457346bb8ac4e
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/446
Tested-by: Jenkins Server
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

4 files changed, 59 insertions, 13 deletions

diff --git a/src/build/citest/autocitest b/src/build/citest/autocitest
index f92ac8bf2..c63383c00 100755
--- a/src/build/citest/autocitest
+++ b/src/build/citest/autocitest
@@ -240,14 +240,21 @@ waitkb
 export sb=$SBXHOME/$TEST_SANDBOX/src
 echo "sandbox dir = $sb"
 
+echo "Running workarounds (presimsetup)."
+if [ -f ${SBXHOME}/src/build/citest/etc/workarounds.presimsetup ] ; then
+    ${SBXHOME}/src/build/citest/etc/workarounds.presimsetup 
+fi
+
 echo "** Set up simics directories **"
-echo "start_simics -no_start -machine $MACHINE" > $sb/my_simics_env_setup
+echo "start_simics -no_start -machine $MACHINE  -batch_mode " > $sb/my_simics_env_setup
+
+# Do a workon and immediately execute the above commands
 chmod 775 $sb/my_simics_env_setup
 workon -sb $TEST_SANDBOX -mppc -c ./my_simics_env_setup
 
-echo "** Executing workarounds **"
-if [ -f ${SBXHOME}/src/build/citest/etc/workarounds ] ; then
-    ${SBXHOME}/src/build/citest/etc/workarounds
+echo "** Executing workarounds (postsimsetup) **"
+if [ -f ${SBXHOME}/src/build/citest/etc/workarounds.postsimsetup ] ; then
+    ${SBXHOME}/src/build/citest/etc/workarounds.postsimsetup
 fi
 
 echo "** Create img directory for hbicore.bin **"
diff --git a/src/build/citest/etc/bbuild b/src/build/citest/etc/bbuild
index 0d063abcb..04c212b4b 100644
--- a/src/build/citest/etc/bbuild
+++ b/src/build/citest/etc/bbuild
@@ -1 +1 @@
-/esw/fips760/Builds/b1007a_1143.760
+/esw/fips760/Builds/b1018a_1143.760
diff --git a/src/build/citest/etc/workarounds.postsimsetup b/src/build/citest/etc/workarounds.postsimsetup
new file mode 100755
index 000000000..b4ee2e082
--- /dev/null
+++ b/src/build/citest/etc/workarounds.postsimsetup
@@ -0,0 +1,32 @@
+#!/bin/sh
+#  IBM_PROLOG_BEGIN_TAG
+#  This is an automatically generated prolog.
+#
+#  $Source: src/build/citest/etc/workarounds.postsim $
+#
+#  IBM CONFIDENTIAL
+#
+#  COPYRIGHT International Business Machines Corp. 2011
+#
+#  p1
+#
+#  Object Code Only (OCO) source materials
+#  Licensed Internal Code Source Materials
+#  IBM HostBoot Licensed Internal Code
+#
+#  The source code for this program is not published or other-
+#  wise divested of its trade secrets, irrespective of what has
+#  been deposited with the U.S. Copyright Office.
+#
+#  Origin: 30
+#
+#  IBM_PROLOG_END
+
+##
+## Workarounds that are run after start_simics is executed for the first time
+##    to setup the sandbox
+##
+
+echo "+++ Patch for PHYP flight recorder."
+sed -i -e's/.*PHYPLEVEL.*//' $sb/../simics/.simics_flightrecorder
+sed -i -e's/.*PHYP_PATCH_LEVEL.*//' $sb/../simics/.simics_flightrecorder
diff --git a/src/build/citest/etc/workarounds b/src/build/citest/etc/workarounds.presimsetup
index 434bf98d5..c53958756 100755
--- a/src/build/citest/etc/workarounds
+++ b/src/build/citest/etc/workarounds.presimsetup
@@ -2,7 +2,7 @@
 #  IBM_PROLOG_BEGIN_TAG
 #  This is an automatically generated prolog.
 #
-#  $Source: src/build/citest/etc/workarounds $
+#  $Source: src/build/citest/etc/workarounds.presim $
 #
 #  IBM CONFIDENTIAL
 #
@@ -22,6 +22,11 @@
 #
 #  IBM_PROLOG_END
 
+##
+## Workarounds that are run before start_simics is executed for the first time
+##    to setup the sandbox
+##
+
 echo "+++ Copy desired SALERNO config file to sandbox and modify L3 to 8MB."
 mkdir -p $sb/simu/configs
 cp $BACKING_BUILD/src/simu/configs/P8_SALERNO.config $sb/simu/configs
@@ -36,12 +41,14 @@ sed -i -e's/SETENV GFW_P8_VENICE_L3_MB_SIZE.*/SETENV GFW_P8_VENICE_L3_MB_SIZE 8/
 # Backing build already contains 910431.  Leave this workaround here for future scomdef files
 #sed -i -e's/SETENV GFW_P8_VENICE_MODEL_EC.*/SETENV GFW_P8_VENICE_MODEL_EC 910431/' $sb/simu/configs/P8_VENICE.config
 
-#echo "+++ Update to new simics build."
-#mkdir -p $sb/simu/data
-#grep -v "WSALIAS HOSTBOOT_LEVEL FIPSLEVEL" $BACKING_BUILD/src/simu/data/simicsInfo > $sb/simu/data/simicsInfo
-#echo "WSALIAS HOSTBOOT_LEVEL FIPSLEVEL env/gfwa/simics-4.2.0/simics-4.2.77/fips/fld36/fi110919b700.42" >> $sb/simu/data/simicsInfo
+echo "+++ Update to new simics build."
+mkdir -p $sb/simu/data
+grep -v "WSALIAS HOSTBOOT_LEVEL FIPSLEVEL" $BACKING_BUILD/src/simu/data/simicsInfo > $sb/simu/data/simicsInfo
+echo "WSALIAS HOSTBOOT_LEVEL FIPSLEVEL env/gfwa/simics-4.2.0/simics-4.2.77/fips/fld36/fi111019b700.42" >> $sb/simu/data/simicsInfo
+grep -v "WSALIAS HOSTBOOT_LEVEL SIMICSLEVEL" $BACKING_BUILD/src/simu/data/simicsInfo > $sb/simu/data/simicsInfo
+echo "WSALIAS HOSTBOOT_LEVEL SIMICSLEVEL env/vtechb/simics-4.2.0/simics-4.2.82/bin" >> $sb/simu/data/simicsInfo
 
+echo "+++ New simics build (fi111013b700.42) needs some new files."
+mkdir -p $sb/simu/data/cec-chip
+cp $BACKING_BUILD/src/simu/data/cec-chip/p8.por $sb/simu/data/cec-chip/p8_master.por
 
-echo "+++ Patch for PHYP flight recorder."
-sed -i -e's/.*PHYPLEVEL.*//' $sb/../simics/.simics_flightrecorder
-sed -i -e's/.*PHYP_PATCH_LEVEL.*//' $sb/../simics/.simics_flightrecorder