Fixed return code issue with hb errlparser command

Change-Id: Ic697270eecdde06a761ff71ff406e2550e979018
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/20227
Tested-by: Jenkins Server
Tested-by: Jenkins OP Build CI
Tested-by: Jenkins OP HW
Tested-by: FSP CI Jenkins
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

2 files changed, 9 insertions, 6 deletions

diff --git a/src/build/citest/build-errl-parsers b/src/build/citest/build-errl-parsers
index f55418dd2..344c3f751 100755
--- a/src/build/citest/build-errl-parsers
+++ b/src/build/citest/build-errl-parsers
@@ -42,14 +42,16 @@ 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
+execute_in_sandbox "cd ${SANDBOXBASE}/src/hbfw && mk -a -j32" "x86.nfp"
+if [ $? -ne 0 ]; then exit -1; fi
+
 echo "----Building srci"
-execute_in_sandbox "cd ${SANDBOXBASE}/src/srci && mk -a -j32" "x86.nfp" \
-    || exit -1
+execute_in_sandbox "cd ${SANDBOXBASE}/src/srci && mk -a -j32" "x86.nfp"
+if [ $? -ne 0 ]; then exit -1; fi
+
 echo "----Building errl"
-execute_in_sandbox "cd ${SANDBOXBASE}/src/errl && mk -a -j32" "x86.nfp" \
-    || exit -1
+execute_in_sandbox "cd ${SANDBOXBASE}/src/errl && mk -a -j32" "x86.nfp"
+if [ $? -ne 0 ]; then exit -1; fi
 
 echo "----Extracting errl tool"
 tar -xvf ${SANDBOXBASE}/obj/x86.nfp/errl/nfp/tool/errl.tar \
diff --git a/src/build/citest/setup-env b/src/build/citest/setup-env
index ddb46c241..db90ecf01 100755
--- a/src/build/citest/setup-env
+++ b/src/build/citest/setup-env
@@ -72,6 +72,7 @@ execute_in_sandbox()
     ${WORKON_CMD} -c ./sandbox_execute_cmd
 
     if [ $? -ne 0 ]; then
+        rm ${SANDBOXBASE}/src/sandbox_execute_cmd
         return -1
     fi