diff options
author | Sachin Gupta <sgupta2m@in.ibm.com> | 2015-11-06 00:04:28 -0600 |
---|---|---|
committer | Amit J. Tendolkar <amit.tendolkar@in.ibm.com> | 2015-11-17 23:37:11 -0600 |
commit | 3866bb58533e50f41888b507d70a71e9443fb4f0 (patch) | |
tree | 009a2d8b4bf3c85eee35dc22db2a3d8e8c2054ab | |
parent | f7d71a20dd8115b5dcff548d95aeb0b9bf86e5b8 (diff) | |
download | talos-sbe-3866bb58533e50f41888b507d70a71e9443fb4f0.tar.gz talos-sbe-3866bb58533e50f41888b507d70a71e9443fb4f0.zip |
Enable test cases for CI
Change-Id: I22b94fe87c1225ef7fbc5c7e85b016192838a3f7
RTC: 123606
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/21802
Tested-by: Jenkins Server
Reviewed-by: Basabjit Sengupta <basengup@in.ibm.com>
Reviewed-by: Amit J. Tendolkar <amit.tendolkar@in.ibm.com>
-rwxr-xr-x | customrc | 2 | ||||
-rwxr-xr-x | sbe/build/citest/autocitest | 21 | ||||
-rwxr-xr-x | sbe/build/citest/build-script | 26 | ||||
-rwxr-xr-x | sbe/build/citest/etc/workarounds.presimsetup | 1 | ||||
-rwxr-xr-x | sbe/test/test.xml | 15 |
5 files changed, 39 insertions, 26 deletions
@@ -9,7 +9,7 @@ #export WORKSPACE=<set it to your root ppe directory. This is required if you # to use build script locally> export MACHINE=NIMBUS -export BACKING_BUILD=/esw/fips910/Builds/b1104t_1544.910/ +export BACKING_BUILD=/esw/fips910/Builds/b1112a_1548.910/ export SIMICSOPTIONS="-nre" diff --git a/sbe/build/citest/autocitest b/sbe/build/citest/autocitest index 9197fb70..71573372 100755 --- a/sbe/build/citest/autocitest +++ b/sbe/build/citest/autocitest @@ -47,21 +47,24 @@ timestamp=`date +'%H:%M:%S'` echo "$timestamp Starting SBE test..." # Check preconditions for run-fsp-it -mkdir -p ~/private -if [ ! -f ~/private/.p ]; then +# This is just workaround. It is expected +# that user already either have this file +# or tokens have been taken by klog command. +# This is just to make run-fsp-it work in user +# sandbox +if [ -z $RUNNING_UNDER_JENKINS ] +then + mkdir -p ~/private + if [ ! -f ~/private/.p ]; then echo "Creating p file" touch ~/private/.p -fi + fi -if [ ! -f ~/private/password ]; then + if [ ! -f ~/private/password ]; then echo "Creating passwd file" touch ~/private/password - # This is just workaround. It is expected - # that user already either have this file - # or tokens have been taken by klog command. - # This is just to make run-fsp-it work in user - # sandbox echo "dummy" > ~/private/password + fi fi execute_in_sandbox "run-fsp-it $NOWIN --machine $MACHINE $SBE_TEST_XML" "ppc" || exit -1 diff --git a/sbe/build/citest/build-script b/sbe/build/citest/build-script index 4d6775b9..7331028c 100755 --- a/sbe/build/citest/build-script +++ b/sbe/build/citest/build-script @@ -23,26 +23,24 @@ scl enable devtoolset-2 " bash -c \"make all\"" || exit -1 make tracehash || exit -1 cd - -#@ TODO via RTC 123606 -# Enable this in another case # Create simics sandbox. -#create-sandbox > create-sandbox.log 2>&1 & -#CREATESANDBOX_PID=$! +create-sandbox > create-sandbox.log 2>&1 & +CREATESANDBOX_PID=$! # 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 +wait $CREATESANDBOX_PID +if [ $? -eq 0 ]; then + cat create-sandbox.log +else + echo "----Sandbox creation failed." + cat create-sandbox.log + exit -1 +fi # Add SBE files to simics sandbox. -#populate-sandbox || exit -1 +populate-sandbox || exit -1 -#sbetest-start.sh || exit -1 +sbetest-start.sh || exit -1 # @TODO via RTC 140875 #Enable it once SBE copyright script is ready diff --git a/sbe/build/citest/etc/workarounds.presimsetup b/sbe/build/citest/etc/workarounds.presimsetup index b1db34de..df18fda1 100755 --- a/sbe/build/citest/etc/workarounds.presimsetup +++ b/sbe/build/citest/etc/workarounds.presimsetup @@ -6,4 +6,3 @@ #egrep -v "WSALIAS DEFAULT FIPSLEVEL|WSALIAS DEFAULT SIMICSLEVEL" $BACKING_BUILD/src/simu/data/simicsInfo > $sb/simu/data/simicsInfo #echo "WSALIAS DEFAULT FIPSLEVEL env/gfwb/simics-4.2.0/simics-4.2.83/fips/fld36/fi120201a700.42" >> $sb/simu/data/simicsInfo #echo "WSALIAS DEFAULT SIMICSLEVEL env/vtechb/simics-4.2.0/simics-4.2.83/bin" >> $sb/simu/data/simicsInfo - diff --git a/sbe/test/test.xml b/sbe/test/test.xml index 9433ba87..1b23623a 100755 --- a/sbe/test/test.xml +++ b/sbe/test/test.xml @@ -1,10 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> <integrationtest> - <platform startsimargs="--notar --norun"> + <platform startsimargs="--notar --norun --sim_parms -nre"> <machine>%%machine%%</machine> <test> + <!-- Set IVPR to point to sbe start address ( currently PIBMEM) --> + <testcase> + <simcmd>p9Proc0.sbe.mibo_space.write 0xc0000160 0xFFFE800000000000 8 -b</simcmd> + <exitonerror>yes</exitonerror> + </testcase> + <testcase> + <simcmd>p9Proc0.sbe.mibo_space.write 0xc00e0000 0x5000000000000000 8 -b</simcmd> + <exitonerror>yes</exitonerror> + </testcase> + <testcase> + <simcmd>sim->frontend_current_processor = p9Proc0.sbe.ppe</simcmd> + <exitonerror>yes</exitonerror> + </testcase> <!-- Register SBE tools --> <testcase> <simcmd>run-python-file targets/p9_nimbus/sbeTest/simics-debug-framework.py</simcmd> |