From 41241a9d96e37ab489c3796c9a938d1c26fc4fd7 Mon Sep 17 00:00:00 2001
From: Patrick Williams <iawillia@us.ibm.com>
Date: Fri, 4 Apr 2014 15:18:12 -0500
Subject: Change autosim parameters to allow parallel builds.

Change-Id: Ic805267746342c0b4893cc97f79a0b0b3476a4f4
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/10154
Tested-by: Jenkins Server
Reviewed-by: Donald E. Dahle <dedahle@us.ibm.com>
Reviewed-by: Andrew J. Geissler <andrewg@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
---
 src/build/citest/autocitest       |  1 +
 src/build/citest/cxxtest-start.sh | 36 +++++++++++++++++++++---------------
 2 files changed, 22 insertions(+), 15 deletions(-)

(limited to 'src/build')

diff --git a/src/build/citest/autocitest b/src/build/citest/autocitest
index d3557e01a..f3c84da73 100755
--- a/src/build/citest/autocitest
+++ b/src/build/citest/autocitest
@@ -195,6 +195,7 @@ export SANDBOXRC
 export SANDBOXROOT=$SBXHOME
 export SANDBOXNAME=$TEST_SANDBOX
 export SANDBOXBASE=$SANDBOXROOT/$SANDBOXNAME
+export AUTOSIM_WORKDIR=$SANDBOXBASE
 
 if [ ! -d "$SBXHOME/$TEST_SANDBOX" ] ; then
         echo "run mksb to create the sandbox "
diff --git a/src/build/citest/cxxtest-start.sh b/src/build/citest/cxxtest-start.sh
index 2793b0722..91bdd351f 100755
--- a/src/build/citest/cxxtest-start.sh
+++ b/src/build/citest/cxxtest-start.sh
@@ -1,34 +1,40 @@
 #!/bin/sh
-#  IBM_PROLOG_BEGIN_TAG
-#  This is an automatically generated prolog.
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
 #
-#  $Source: src/build/citest/cxxtest-start.sh $
+# $Source: src/build/citest/cxxtest-start.sh $
 #
-#  IBM CONFIDENTIAL
+# IBM CONFIDENTIAL
 #
-#  COPYRIGHT International Business Machines Corp. 2011
+# COPYRIGHT International Business Machines Corp. 2011,2014
 #
-#  p1
+# p1
 #
-#  Object Code Only (OCO) source materials
-#  Licensed Internal Code Source Materials
-#  IBM HostBoot Licensed Internal Code
+# 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.
+# The source code for this program is not published or otherwise
+# divested of its trade secrets, irrespective of what has been
+# deposited with the U.S. Copyright Office.
 #
-#  Origin: 30
+# Origin: 30
 #
-#  IBM_PROLOG_END
+# IBM_PROLOG_END_TAG
 #
 export WORKSPACE_DIR=`pwd`
 export COPYRIGHT_CHECK=${WORKSPACE_DIR}/src/build/tools/copyright-check.sh
 export AUTOCITEST=${WORKSPACE_DIR}/src/build/citest/autocitest
 export BACKING_BUILD=`cat ${WORKSPACE_DIR}/src/build/citest/etc/bbuild`
-CXXTEST_REMOTE_SANDBOX="cxxtest_sb"
 HOSTBOOT_IMAGE=img/hbicore_test.bin
 
+if [ -z $JOB_NAME -o -z $BUILD_NUMBER ];
+then
+    CXXTEST_REMOTE_SANDBOX="cxxtest_sb"
+else
+    CXXTEST_REMOTE_SANDBOX=`echo $JOB_NAME $BUILD_NUMBER | md5sum | head -c10`
+fi
+
 #
 #   Validate Copyright blocks
 if [ -f $COPYRIGHT_CHECK ]; then
-- 
cgit v1.2.1