diff options
author | Richard J. Knight <rjknight@us.ibm.com> | 2017-09-08 12:40:20 -0500 |
---|---|---|
committer | Sachin Gupta <sgupta2m@in.ibm.com> | 2017-10-05 20:33:48 -0400 |
commit | 2bc9271a9ef6dcec2a349f148600fe4fcf0c0960 (patch) | |
tree | 12978b1a7b9a37623115f8c03e10c66f9c681484 | |
parent | 63bcf2a5bf40a24697313dfec342c1b7ebc2fcd1 (diff) | |
download | talos-sbe-2bc9271a9ef6dcec2a349f148600fe4fcf0c0960.tar.gz talos-sbe-2bc9271a9ef6dcec2a349f148600fe4fcf0c0960.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/45910
Reviewed-by: Hostboot Team <hostboot@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
-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 9b74e26d..06b90d10 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"; #---------------------------------------------------------------------- |