diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/build/citest/build-errl-parsers | 54 | ||||
| -rwxr-xr-x | src/build/citest/build-script | 12 | ||||
| -rwxr-xr-x | src/build/tools/hb | 22 |
3 files changed, 67 insertions, 21 deletions
diff --git a/src/build/citest/build-errl-parsers b/src/build/citest/build-errl-parsers new file mode 100755 index 000000000..0b7dbb917 --- /dev/null +++ b/src/build/citest/build-errl-parsers @@ -0,0 +1,54 @@ +#!/bin/sh +# IBM_PROLOG_BEGIN_TAG +# This is an automatically generated prolog. +# +# $Source: src/build/citest/build-errl-parsers $ +# +# IBM CONFIDENTIAL +# +# COPYRIGHT International Business Machines Corp. 2014 +# +# p1 +# +# 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 otherwise +# divested of its trade secrets, irrespective of what has been +# deposited with the U.S. Copyright Office. +# +# Origin: 30 +# +# IBM_PROLOG_END_TAG + +echo "====Building error log parsers====" + +if [ -z $HOSTBOOT_CI_ENV_SETUP ]; +then + source "$HOSTBOOTROOT/src/build/citest/setup-env" +fi + +if [ ! -d "$SANDBOXBASE" ]; +then + echo "Cannot find sandbox $SANDBOXBASE" + exit -1 +fi + +echo "----Creating directories" +mkdir -p ${SANDBOXBASE}/src/srci || exit -1 +mkdir -p ${SANDBOXBASE}/src/errl || exit -1 + +echo "----Building hbfw" +execute_in_sandbox "cd ${SANDBOXBASE}/src/hbfw && mk -a -j32" "x86.nfp" \ + || exit -1 +echo "----Building srci" +execute_in_sandbox "cd ${SANDBOXBASE}/src/srci && mk -a -j32" "x86.nfp" \ + || exit -1 +echo "----Building errl" +execute_in_sandbox "cd ${SANDBOXBASE}/src/errl && mk -a -j32" "x86.nfp" \ + || exit -1 + +echo "----Extracting errl tool" +tar -xvf ${SANDBOXBASE}/obj/x86.nfp/errl/nfp/tool/errl.tar \ + -C ${SANDBOXBASE}/simics errl || exit -1 diff --git a/src/build/citest/build-script b/src/build/citest/build-script index 12cdb43bc..653bec687 100755 --- a/src/build/citest/build-script +++ b/src/build/citest/build-script @@ -54,6 +54,10 @@ fi # Add Hostboot files to simics sandbox. populate-sandbox || exit -1 +# Start errl parser building. +build-errl-parsers > errl-parsers.log 2>&1 & +ERRLPARSERS_PID=$! + # Start CxxTest Simics execution. cxxtest-start.sh || exit -1 @@ -67,3 +71,11 @@ else exit -1 fi +# Check errl parser completion. +wait $ERRLPARSERS_PID +if [ $? -ne 0 ]; then + echo "----Error parsers failed." + cat errl-parsers.log + exit -1 +fi + diff --git a/src/build/tools/hb b/src/build/tools/hb index 3405277eb..62eb7451b 100755 --- a/src/build/tools/hb +++ b/src/build/tools/hb @@ -436,27 +436,7 @@ hb_errlparser() exit -1 fi - # make sure the srci and errl dirs are present - # x86.nfp context - mkdir -p ${SANDBOXBASE}/src/srci - mkdir -p ${SANDBOXBASE}/src/errl - - # Trigger a build of the hostboot plugins we shipped with the - # hb prime cmd. - execute_in_sandbox "cd ${SANDBOXBASE}/src/hbfw/ \ - && mk -a -j32" "x86.nfp" - - # build srci in x86 context - execute_in_sandbox "cd ${SANDBOXBASE}/src/srci \ - && mk -a -j32" "x86.nfp" - - # build errl in x86 context, to pick-up the parser libs from - # hostboot. - execute_in_sandbox "cd ${SANDBOXBASE}/src/errl \ - && mk -a -j32" "x86.nfp" - - cd ${SANDBOXBASE}/simics - tar -xvf $SANDBOXBASE/obj/x86.nfp/errl/nfp/tool/errl.tar errl + ${HOSTBOOTROOT}/src/build/citest/build-errl-parsers } hb_cachesync() |
