SBE code restructure: moving citest

Change-Id: I7f74353e75208d7321566d5079e0e8c71cd1ae69
RTC:159709
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/28829
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: RAJA DAS <rajadas2@in.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Reviewed-by: AMIT J. TENDOLKAR <amit.tendolkar@in.ibm.com>

16 files changed, 74 insertions, 36 deletions

diff --git a/sbe/build/citest/sbetest-start.sh b/sbe/build/citest/sbetest-start.sh
deleted file mode 100755
index 24e661e1..00000000
--- a/sbe/build/citest/sbetest-start.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-if [ -z $SBE_CI_ENV_SETUP ];
-then
-    unset $SANDBOXBASE
-    unset $SANDBOXNAME
-    source "$SBEROOT/sbe/build/citest/setup-env"
-fi
-
-#   Front end to autocitest - script to execute unit tests under simics.
-#
-##  when jenkins runs it will create a workspace with the built code tree
-##  and drop us into it.
-autocitest ${BACKING_BUILD}
-
-exit $?
diff --git a/sbe/build/citest/autocitest b/sbe/test/citest/autocitest
index 71573372..70c9ba51 100755
--- a/sbe/build/citest/autocitest
+++ b/sbe/test/citest/autocitest
@@ -1,4 +1,27 @@
 #!/bin/bash
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: sbe/test/citest/autocitest $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+#
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# IBM_PROLOG_END_TAG
 ################################################################################
 ##  Simics automation using run-fsp-it
 ################################################################################
diff --git a/sbe/build/citest/build-script b/sbe/test/citest/build-script
index 6eecffa9..00ef83c6 100755
--- a/sbe/build/citest/build-script
+++ b/sbe/test/citest/build-script
@@ -2,12 +2,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/build/citest/build-script $
+# $Source: sbe/test/citest/build-script $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2015,2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -32,7 +31,7 @@ if [ -z $SBEROOT ]; then
     source "$WORKSPACE/env.bash"
 fi
 
-source "$SBEROOT/sbe/build/citest/setup-env"
+source "$SBEROOT/sbe/test/citest/setup-env"
 
 # Check copyright.
 #check-copyright > copyright.log 2>&1 &
diff --git a/sbe/build/citest/check-copyright b/sbe/test/citest/check-copyright
index 86224452..31c8c2a6 100755
--- a/sbe/build/citest/check-copyright
+++ b/sbe/test/citest/check-copyright
@@ -2,12 +2,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/build/citest/check-copyright $
+# $Source: sbe/test/citest/check-copyright $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,8 +23,8 @@
 #
 # IBM_PROLOG_END_TAG
 
-COPYRIGHT_CHECK=${SBEROOT}/sbe/build/citest/copyright-check.sh
-COMMIT_CHECK=${SBEROOT}/sbe/build/tools/hooks/verify-commit
+COPYRIGHT_CHECK=${SBEROOT}/sbe/test/citest/copyright-check.sh
+COMMIT_CHECK=${SBEROOT}/sbe/test/tools/hooks/verify-commit
 
 $COPYRIGHT_CHECK || exit -1
 $COMMIT_CHECK || exit -1
diff --git a/sbe/build/citest/copyright-check.sh b/sbe/test/citest/copyright-check.sh
index c565beff..674bab94 100755
--- a/sbe/build/citest/copyright-check.sh
+++ b/sbe/test/citest/copyright-check.sh
@@ -2,12 +2,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/build/citest/copyright-check.sh $
+# $Source: sbe/test/citest/copyright-check.sh $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/sbe/build/citest/create-sandbox b/sbe/test/citest/create-sandbox
index b2cbc0bf..daae3046 100755
--- a/sbe/build/citest/create-sandbox
+++ b/sbe/test/citest/create-sandbox
@@ -2,12 +2,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/build/citest/create-sandbox $
+# $Source: sbe/test/citest/create-sandbox $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2015,2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/sbe/build/citest/etc/patches/chip.act.patch b/sbe/test/citest/etc/patches/chip.act.patch
index 0b9cf0f0..0b9cf0f0 100644
--- a/sbe/build/citest/etc/patches/chip.act.patch
+++ b/sbe/test/citest/etc/patches/chip.act.patch
diff --git a/sbe/build/citest/etc/patches/patchlist.txt b/sbe/test/citest/etc/patches/patchlist.txt
index 4fd0444a..4fd0444a 100644
--- a/sbe/build/citest/etc/patches/patchlist.txt
+++ b/sbe/test/citest/etc/patches/patchlist.txt
diff --git a/sbe/build/citest/etc/patches/pervasive.act.patch b/sbe/test/citest/etc/patches/pervasive.act.patch
index 5531bef6..5531bef6 100644
--- a/sbe/build/citest/etc/patches/pervasive.act.patch
+++ b/sbe/test/citest/etc/patches/pervasive.act.patch
diff --git a/sbe/build/citest/etc/patches/powermgmt.act.patch b/sbe/test/citest/etc/patches/powermgmt.act.patch
index efb03845..efb03845 100644
--- a/sbe/build/citest/etc/patches/powermgmt.act.patch
+++ b/sbe/test/citest/etc/patches/powermgmt.act.patch
diff --git a/sbe/build/citest/etc/patches/standalone.simics.patch b/sbe/test/citest/etc/patches/standalone.simics.patch
index bdc40fd8..bdc40fd8 100644
--- a/sbe/build/citest/etc/patches/standalone.simics.patch
+++ b/sbe/test/citest/etc/patches/standalone.simics.patch
diff --git a/sbe/build/citest/etc/workarounds.postsimsetup b/sbe/test/citest/etc/workarounds.postsimsetup
index 4635bd00..adfdfe26 100755
--- a/sbe/build/citest/etc/workarounds.postsimsetup
+++ b/sbe/test/citest/etc/workarounds.postsimsetup
@@ -2,12 +2,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/build/citest/etc/workarounds.postsimsetup $
+# $Source: sbe/test/citest/etc/workarounds.postsimsetup $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2015,2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -40,5 +39,5 @@
 echo "+++ Patching standalone.simics"
 mkdir -p $SANDBOXBASE/obj/ppc/simu/scripts/hbfw
 cp $BACKING_BUILD/obj/ppc/simu/scripts/hbfw/standalone.simics $SANDBOXBASE/obj/ppc/simu/scripts/hbfw
-patch -p0 $SANDBOXBASE/obj/ppc/simu/scripts/hbfw/standalone.simics $SBEROOT/sbe/build/citest/etc/patches/standalone.simics.patch
+patch -p0 $SANDBOXBASE/obj/ppc/simu/scripts/hbfw/standalone.simics $SBEROOT/sbe/test/citest/etc/patches/standalone.simics.patch
 
diff --git a/sbe/build/citest/etc/workarounds.presimsetup b/sbe/test/citest/etc/workarounds.presimsetup
index c3371479..284b0293 100755
--- a/sbe/build/citest/etc/workarounds.presimsetup
+++ b/sbe/test/citest/etc/workarounds.presimsetup
@@ -2,12 +2,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/build/citest/etc/workarounds.presimsetup $
+# $Source: sbe/test/citest/etc/workarounds.presimsetup $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2015,2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/sbe/build/citest/populate-sandbox b/sbe/test/citest/populate-sandbox
index f99d5197..91d646f0 100755
--- a/sbe/build/citest/populate-sandbox
+++ b/sbe/test/citest/populate-sandbox
@@ -2,12 +2,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/build/citest/populate-sandbox $
+# $Source: sbe/test/citest/populate-sandbox $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2015,2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/sbe/test/citest/sbetest-start.sh b/sbe/test/citest/sbetest-start.sh
new file mode 100755
index 00000000..c70cc5d7
--- /dev/null
+++ b/sbe/test/citest/sbetest-start.sh
@@ -0,0 +1,38 @@
+#!/bin/sh
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: sbe/test/citest/sbetest-start.sh $
+#
+# OpenPOWER sbe Project
+#
+# Contributors Listed Below - COPYRIGHT 2016
+#
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# permissions and limitations under the License.
+#
+# IBM_PROLOG_END_TAG
+if [ -z $SBE_CI_ENV_SETUP ];
+then
+    unset $SANDBOXBASE
+    unset $SANDBOXNAME
+    source "$SBEROOT/sbe/test/citest/setup-env"
+fi
+
+#   Front end to autocitest - script to execute unit tests under simics.
+#
+##  when jenkins runs it will create a workspace with the built code tree
+##  and drop us into it.
+autocitest ${BACKING_BUILD}
+
+exit $?
diff --git a/sbe/build/citest/setup-env b/sbe/test/citest/setup-env
index 97e063a9..a9ceea69 100755
--- a/sbe/build/citest/setup-env
+++ b/sbe/test/citest/setup-env
@@ -2,12 +2,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: sbe/build/citest/setup-env $
+# $Source: sbe/test/citest/setup-env $
 #
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2015,2016
-# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,7 +23,7 @@
 #
 # IBM_PROLOG_END_TAG
 
-export CITESTPATH=${SBEROOT}/sbe/build/citest
+export CITESTPATH=${SBEROOT}/sbe/test/citest
 export PATH=${CITESTPATH}:${PATH}
 
 # If we are running under Jenkins we need to pick a random-ish sandbox name