Skip to content

Commit

Permalink
multiple collectFfdc tags results in dupicate code
Browse files Browse the repository at this point in the history
    -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>
  • Loading branch information
rjknight authored and crgeddes committed Oct 8, 2017
1 parent becf8e0 commit d450440
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions src/import/hwpf/fapi2/tools/parseErrorInfo.pl
Expand Up @@ -727,7 +727,7 @@ sub addFfdcMethod
@elements[$i] =~ s/^\s+|\s+$//g;
addFfdcMethod( \%methods, @elements[$i], $err->{rc}, $ffdc_type, $objNum );

$collectFfdc .= "@elements[$i]"
$collectFfdc .= "@elements[$i]";

}

Expand All @@ -751,11 +751,13 @@ sub addFfdcMethod

# 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";

#----------------------------------------------------------------------
Expand Down

0 comments on commit d450440

Please sign in to comment.