From 2144471f6a5958a327bc07d784e17c98575acd75 Mon Sep 17 00:00:00 2001
From: Dean Sanner <dsanner@us.ibm.com>
Date: Tue, 5 Jan 2016 14:40:21 -0600
Subject: Fix Simics hb_machine, Enable Simics for CI

RTC: 137477
Change-Id: I57d1b410ebaaccc6e270ea7ff15f83fe7c70f177
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/23054
Tested-by: Jenkins Server
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
---
 src/build/citest/create-sandbox | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

(limited to 'src/build/citest/create-sandbox')

diff --git a/src/build/citest/create-sandbox b/src/build/citest/create-sandbox
index 4f8662924..f008822e6 100755
--- a/src/build/citest/create-sandbox
+++ b/src/build/citest/create-sandbox
@@ -6,7 +6,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2014,2015
+# Contributors Listed Below - COPYRIGHT 2014,2016
 # [+] International Business Machines Corp.
 #
 #
@@ -48,26 +48,27 @@ fi
 mksb -rc $SANDBOXRC -dir $SANDBOXROOT -back $BACKING_BUILD -sb $SANDBOXNAME \
       -m ppc -auto || exit -1
 
-# TODO: RTC:137477-Turn this pre/post workaround scripts and start simics
 # workaround scripts expect $sb variable to be populated.
-#export sb=$SANDBOXBASE/src
+export sb=$SANDBOXBASE/src
+export bb=$BACKING_BUILD
+export bbsrc=$BACKING_BUILD/src
 
 # Run presimsetup workarounds.
-#echo "----Running presimsetup workarounds."
-#if [ -f ${CITESTPATH}/etc/workarounds.presimsetup ];
-#then
-#    ${CITESTPATH}/etc/workarounds.presimsetup || exit -1
-#fi
+echo "----Running presimsetup workarounds."
+if [ -f ${CITESTPATH}/etc/workarounds.presimsetup ];
+then
+    ${CITESTPATH}/etc/workarounds.presimsetup || exit -1
+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
+echo "----Setting up simics."
+execute_in_sandbox "start_simics -no_start -machine $MACHINE -batch_mode" \
+                   "ppc" || exit -1
 
 # Run postsimsetup workarounds.
-#echo "----Running postsimsetup workarounds."
-#if [ -f ${CITESTPATH}/etc/workarounds.postsimsetup ];
-#then
-#    ${CITESTPATH}/etc/workarounds.postsimsetup || exit -1
-#fi
+echo "----Running postsimsetup workarounds."
+if [ -f ${CITESTPATH}/etc/workarounds.postsimsetup ];
+then
+    ${CITESTPATH}/etc/workarounds.postsimsetup || exit -1
+fi
 
-- 
cgit v1.2.1