Remove proc_example_errors to fix mirror

Change-Id: If593c4d0ad0025f73b9242cf0b9431a016285902
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41002
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Stephen M. Cprek <smcprek@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>

3 files changed, 9 insertions, 136 deletions

diff --git a/src/import/chips/p9/procedures/xml/error_info/proc_example_errors.xml b/src/import/chips/p9/procedures/xml/error_info/proc_example_errors.xml
deleted file mode 100644
index db580edcc..000000000
--- a/src/import/chips/p9/procedures/xml/error_info/proc_example_errors.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<!-- IBM_PROLOG_BEGIN_TAG                                                   -->
-<!-- This is an automatically generated prolog.                             -->
-<!--                                                                        -->
-<!-- $Source: src/import/chips/p9/procedures/xml/error_info/proc_example_errors.xml $ -->
-<!--                                                                        -->
-<!-- OpenPOWER HostBoot Project                                             -->
-<!--                                                                        -->
-<!-- Contributors Listed Below - COPYRIGHT 2015,2016                        -->
-<!-- [+] International Business Machines Corp.                              -->
-<!--                                                                        -->
-<!--                                                                        -->
-<!-- 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                                                     -->
-<hwpErrors>
-
-   <registerFfdc>
-     <id>REG_FFDC_TEST_X_PROC_REGISTERS</id>
-     <scomRegister>EX_PRD_PURGE_CMD_REG</scomRegister>
-     <scomRegister>EX_L2_FIR_REG</scomRegister>
-     <cfamRegister>PERV_FSI2PIB_CHIPID_FSI</cfamRegister>
-     <!--scomRegister>GPE0_STATUS</scomRegister-->
-  </registerFfdc>
-
-  <registerFfdc>
-    <id>REG_FFDC_TEST_X_EX_REGISTERS</id>
-    <scomRegister>EX_L3_FIR_REG</scomRegister>
-  </registerFfdc>
-
-  <registerFfdc>
-    <id>REG_FFDC_TEST_X_MBA_REGISTERS</id>
-    <scomRegister>MCA_RECR</scomRegister>
-    <scomRegister>MCA_MBA_FARB5Q</scomRegister>
-  </registerFfdc>
-
-  <registerFfdc>
-    <id>REG_FFDC_TEST_X_PROC_REGISTERS_PRES_CHILDREN</id>
-    <scomRegister>EX_PRD_PURGE_CMD_REG</scomRegister>
-    <scomRegister>EX_L2_FIR_REG</scomRegister>
-  </registerFfdc>
-
-  <hwpError>
-    <rc>RC_TEST_ERROR_A</rc>
-    <description>HWP Error A generated by Unit Test</description>
-    <!-- Collect child chiplet register FFDC -->
-    <!-- Collect register FFDC based on present children -->
-    <collectRegisterFfdc>
-       <id>REG_FFDC_TEST_X_PROC_REGISTERS_PRES_CHILDREN</id>
-       <basedOnPresentChildren>
-         <target>TARGET</target>
-         <targetType>TARGET_TYPE_PROC_CHIP</targetType>
-         <childType>TARGET_TYPE_EX_CHIPLET</childType>
-         <childPosOffsetMultiplier>0x01000000</childPosOffsetMultiplier>
-       </basedOnPresentChildren>
-    </collectRegisterFfdc>
-    <collectRegisterFfdc>
-      <id>REG_FFDC_TEST_X_PROC_REGISTERS</id>
-      <target>TARGET</target>
-      <targetType>TARGET_TYPE_PROC_CHIP</targetType>
-  </collectRegisterFfdc>
-
-</hwpError>
-
-
-<hwpError>
-    <rc>RC_PROC_EXAMPLE_ERROR</rc>
-    <description>
-        test example
-    </description>
-    <buffer>BUFFER</buffer>
-    <collectFfdc>p9_collect_some_ffdc,parm1</collectFfdc>
-    <callout>
-      <procedure>CODE</procedure>
-      <priority>HIGH</priority>
-    </callout>
-
-    <!-- Collect chip register FFDC -->
-    <collectRegisterFfdc>
-       <id>REG_FFDC_TEST_X_PROC_REGISTERS</id>
-       <target>UNIT_TEST_CHIP_TARGET</target>
-       <targetType>TARGET_TYPE_PROC_CHIP</targetType>
-    </collectRegisterFfdc>
-
-    <collectRegisterFfdc>
-       <id>REG_FFDC_TEST_X_EX_REGISTERS</id>
-       <childTargets>
-           <parent>UNIT_TEST_CHIP_TARGET</parent>
-           <parentType>TARGET_TYPE_PROC_CHIP</parentType>
-         <childType>TARGET_TYPE_EX_CHIPLET</childType>
-       </childTargets>
-    </collectRegisterFfdc>
-
-    <!-- Collect child chiplet register FFDC -->
-    <!-- Collect register FFDC based on present children -->
-    <collectRegisterFfdc>
-       <id>REG_FFDC_TEST_X_PROC_REGISTERS_PRES_CHILDREN</id>
-       <basedOnPresentChildren>
-         <target>UNIT_TEST_CHIP_TARGET</target>
-         <targetType>TARGET_TYPE_PROC_CHIP</targetType>
-         <childType>TARGET_TYPE_EX_CHIPLET</childType>
-         <childPosOffsetMultiplier>0x01000000</childPosOffsetMultiplier>
-       </basedOnPresentChildren>
-    </collectRegisterFfdc>
-</hwpError>
-
-<hwpError>
-    <rc>RC_TEST_PROC_ERROR</rc>
-    <description>
-        Example error that calls a procedure with a parameter.
-        parm1 = uint32_t
-    </description>
-    <collectFfdc>p9_collect_some_ffdc,parm1</collectFfdc>
-</hwpError>
-
-</hwpErrors>
-
-
diff --git a/src/usr/fapi2/test/rcSupport.C b/src/usr/fapi2/test/rcSupport.C
index 77152fca5..eda387a84 100644
--- a/src/usr/fapi2/test/rcSupport.C
+++ b/src/usr/fapi2/test/rcSupport.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016                             */
+/* Contributors Listed Below - COPYRIGHT 2016,2017                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -63,9 +63,9 @@ fapi2::ReturnCode p9_registerFfdc_fail(
 {
     FAPI_INF("Enter p9_registerFfdc_fail...");
 
-    FAPI_ASSERT(0, fapi2::TEST_ERROR_A().set_TARGET(i_proc_target));
+    //FAPI_ASSERT(0, fapi2::TEST_ERROR_A().set_TARGET(i_proc_target));
 
-  fapi_try_exit:
+  //fapi_try_exit:
 
     FAPI_INF("Exiting p9_registerFfdc_fail...");
 
@@ -82,13 +82,13 @@ fapi2::ReturnCode p9_procedureFfdc_fail()
 {
     FAPI_INF("Enter p9_procedureFfdc_fail...");
 
-    uint32_t pib = 0x0001;
+    //uint32_t pib = 0x0001;
     fapi2::ReturnCode l_rc;
 
-    FAPI_ASSERT(0, fapi2::TEST_PROC_ERROR(fapi2::FAPI2_ERRL_SEV_RECOVERED,
-                                          l_rc).set_parm1(pib));
+    //FAPI_ASSERT(0, fapi2::TEST_PROC_ERROR(fapi2::FAPI2_ERRL_SEV_RECOVERED,
+    //                                      l_rc).set_parm1(pib));
 
-  fapi_try_exit:
+  //fapi_try_exit:
 
     FAPI_INF("Exiting p9_procedureFfdc_fail...");
 
diff --git a/src/usr/fapi2/test/rcTest.C b/src/usr/fapi2/test/rcTest.C
index 4f266e0f6..c8a437ff4 100755
--- a/src/usr/fapi2/test/rcTest.C
+++ b/src/usr/fapi2/test/rcTest.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2011,2016                        */
+/* Contributors Listed Below - COPYRIGHT 2011,2017                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -168,7 +168,7 @@ uint32_t rcTestReturnCodeCreator()
         {
             // Set the return code to a HWP code (intentionally use function
             // that does not add error information).
-            l_rc._setHwpError(RC_TEST_ERROR_A);
+            //l_rc._setHwpError(RC_TEST_ERROR_A);
 
             // Ensure that the creator is HWP
             l_creator = l_rc.getCreator();