diff options
| author | Patrick Williams <iawillia@us.ibm.com> | 2011-08-04 13:49:06 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2011-08-04 14:43:52 -0500 |
| commit | 3e5358e29304a61a33baedd1d6766461eaa618f3 (patch) | |
| tree | fb767b735f417e957d5d7d2ce390c44ea90a69cb /src/build | |
| parent | ed68417bd42e25ea9b715faf47827244898a53b6 (diff) | |
| download | talos-hostboot-3e5358e29304a61a33baedd1d6766461eaa618f3.tar.gz talos-hostboot-3e5358e29304a61a33baedd1d6766461eaa618f3.zip | |
Update simics bbuild and workarounds for phyp flightrecorder failure.
Change-Id: Id2d3ddf8eb2d4d74064f02dce8117c9bb8cf313a
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/228
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/build')
| -rwxr-xr-x | src/build/citest/autocitest | 6 | ||||
| -rw-r--r-- | src/build/citest/etc/bbuild | 2 | ||||
| -rwxr-xr-x | src/build/citest/etc/workarounds | 7 |
3 files changed, 9 insertions, 6 deletions
diff --git a/src/build/citest/autocitest b/src/build/citest/autocitest index 6d5cbb00b..fd92785e3 100755 --- a/src/build/citest/autocitest +++ b/src/build/citest/autocitest @@ -350,7 +350,7 @@ declare -i timeout=0 modsstarted=0 modscompleted=0 loopcount=0 -while [ $modsstarted -lt 1 -o $modsstarted -ne $modscompleted ]; do +while [ $(($modsstarted)) -lt 1 -o $(($modsstarted)) -ne $(($modscompleted)) ]; do sleep 5 ((loopcount++)) # increment loopcount autosim $NOWIN --simcmd "phys_mem.read 0x$mods_started_addr 0x08" 1> $SBXHOME/modsstarted.log 2> /dev/null @@ -473,11 +473,11 @@ if [ 0 != $timeout ] ; then echo "Modules completed: $modscompleted" exit 1 fi -if [ 0 != $failedtests ] ; then +if [ 0 != $(($failedtests)) ] ; then echo "$failedtests testcases failed." exit 1 fi -if [ 0 != $warnings ] ; then +if [ 0 != $(($warnings)) ] ; then echo "$warnings testcase warnings found." exit 1 fi diff --git a/src/build/citest/etc/bbuild b/src/build/citest/etc/bbuild index 1368cf62b..ff74cb43d 100644 --- a/src/build/citest/etc/bbuild +++ b/src/build/citest/etc/bbuild @@ -1 +1 @@ -/esw/fips750/Builds/b0720a_1132.750 +/esw/fips750/Builds/b0729a_1132.750 diff --git a/src/build/citest/etc/workarounds b/src/build/citest/etc/workarounds index 7b7a52867..5e55e98e8 100755 --- a/src/build/citest/etc/workarounds +++ b/src/build/citest/etc/workarounds @@ -1,8 +1,8 @@ #!/bin/sh # This workaround is fixed in b0722a_1132.750 according to Ched." -echo "+++ Workaround for SMM error starting simics." -/afs/rchland/usr2/ched/public/hostboot/fix_ph110510.sh +#echo "+++ Workaround for SMM error starting simics." +#/afs/rchland/usr2/ched/public/hostboot/fix_ph110510.sh echo "+++ Copy desired SALERNO config file to sandbox and modify L3 to 8MB." mkdir -p $sb/simu/configs @@ -14,3 +14,6 @@ echo "+++ Copy in the P8 scomdef." mkdir -p $sb/engd/scomdef cp /gsa/ausgsa/home/a/n/andrewg/web/public/hostboot/simics/p8_910431.scomdef $sb/engd/scomdef/ +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 |
