Reorganize citest scripts.

    Split pieces of the autocitest script out so that we can control the
    order of the pieces, allow some to run in parallel, etc.  This will
    enable us to build the error log parsers as part of Jenkins testing.

Change-Id: I017c7b0516673dc267eb90adf03b4604602281e6
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/10673
Tested-by: Jenkins Server
Reviewed-by: Donald E. Dahle <dedahle@us.ibm.com>
Reviewed-by: STEPHEN M. CPREK <smcprek@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

1 files changed, 42 insertions, 2 deletions

diff --git a/src/build/citest/build-script b/src/build/citest/build-script
index 6f53a7735..12cdb43bc 100755
--- a/src/build/citest/build-script
+++ b/src/build/citest/build-script
@@ -22,8 +22,48 @@
 #
 # IBM_PROLOG_END_TAG
 
-source "$WORKSPACE/env.bash"
+if [ -z $HOSTBOOTROOT ]; then
+    source "$WORKSPACE/env.bash"
+fi
+
+source "$HOSTBOOTROOT/src/build/citest/setup-env"
+
 #export HOSTBOOT_DEBUG=1    #-- Ensure printkd / tracd is compiled in.
 
+# Check copyright.
+check-copyright > copyright.log 2>&1 &
+COPYRIGHT_PID=$!
+
+# Create simics sandbox.
+create-sandbox > create-sandbox.log 2>&1 &
+CREATESANDBOX_PID=$!
+
+# Build Hostboot.
 make -j32 || exit -1
-$WORKSPACE/src/build/citest/cxxtest-start.sh || exit -1
+
+# Check sandbox create completion.
+wait $CREATESANDBOX_PID
+if [ $? -eq 0 ]; then
+    cat create-sandbox.log
+else
+    echo "----Sandbox creation failed."
+    cat create-sandbox.log
+    exit -1
+fi
+
+# Add Hostboot files to simics sandbox.
+populate-sandbox || exit -1
+
+# Start CxxTest Simics execution.
+cxxtest-start.sh || exit -1
+
+# Check copyright completion.
+wait $COPYRIGHT_PID
+if [ $? -eq 0 ]; then
+    cat copyright.log
+else
+    echo "----Copyright check failed."
+    cat copyright.log
+    exit -1
+fi
+