diff options
author | Richard J. Knight <rjknight@us.ibm.com> | 2017-09-08 12:40:20 -0500 |
---|---|---|
committer | Christian R. Geddes <crgeddes@us.ibm.com> | 2017-10-08 02:22:59 -0400 |
commit | d4504402b1a9eda36c029f639e0fce5cffde0ec9 (patch) | |
tree | 134220bbae11cb95816a46dc32f8b098efa26843 /src/import/hwpf/fapi2/tools | |
parent | becf8e09008f3af95b7c9e9c5a9132008c3e82e9 (diff) | |
download | talos-hostboot-d4504402b1a9eda36c029f639e0fce5cffde0ec9.tar.gz talos-hostboot-d4504402b1a9eda36c029f639e0fce5cffde0ec9.zip |
multiple collectFfdc tags results in dupicate code
-Updated parser to eliminate multiple calls when there are
more than on collectFfdc tag in the hwpError section
Change-Id: I04b485d7d232d65d9ba02add03d8ac0901872c7f
RTC:179620
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/45904
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: AMIT J. TENDOLKAR <amit.tendolkar@in.ibm.com>
Reviewed-by: Prem Shanker Jha <premjha2@in.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/45911
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Diffstat (limited to 'src/import/hwpf/fapi2/tools')
-rwxr-xr-x | src/import/hwpf/fapi2/tools/parseErrorInfo.pl | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/import/hwpf/fapi2/tools/parseErrorInfo.pl b/src/import/hwpf/fapi2/tools/parseErrorInfo.pl index 67da0a679..768a8b101 100755 --- a/src/import/hwpf/fapi2/tools/parseErrorInfo.pl +++ b/src/import/hwpf/fapi2/tools/parseErrorInfo.pl @@ -727,7 +727,7 @@ foreach my $argnum ( 0 .. $#ARGV ) @elements[$i] =~ s/^\s+|\s+$//g; addFfdcMethod( \%methods, @elements[$i], $err->{rc}, $ffdc_type, $objNum ); - $collectFfdc .= "@elements[$i]" + $collectFfdc .= "@elements[$i]"; } @@ -751,11 +751,13 @@ foreach my $argnum ( 0 .. $#ARGV ) # assign the tempRc with newly added ffdc back to the passed in RC $collectFfdcStr .= "\tRC = tempRc; \\\n"; - - print EIFILE "\\\n{ \\\n$collectFfdcStr \\\n}"; - } #end collectFfdc tag + if ( defined $collectFfdcStr ) + { + print EIFILE "\\\n{ \\\n$collectFfdcStr}"; + } + print EIFILE "\n"; #---------------------------------------------------------------------- |