tests: Fixed coverage reports

git-svn-id: http://pugixml.googlecode.com/svn/trunk@675 99668b35-9821-0410-8761-19e4c4f06640
This commit is contained in:
arseny.kapoulkine 2010-08-29 15:34:10 +00:00
parent 1a59bf3992
commit 5442ff6aba
2 changed files with 7 additions and 11 deletions

View File

@ -101,14 +101,10 @@ foreach $toolset (@toolsets)
{ {
my $configuration = $1; my $configuration = $1;
my $defineset = ($2 eq $stddefine) ? '' : $2; my $defineset = ($2 eq $stddefine) ? '' : $2;
my $file;
$file = "pugixml $1" if (/pugixml\.cpp' executed:([^%]+)%/); if (/pugixml\.cpp' executed:([^%]+)%/)
$file = "pugixpath $1" if (/pugixpath\.cpp' executed:([^%]+)%/);
if (defined($file))
{ {
print "### autotest $Config{archname} $toolset $configuration [$defineset] coverage $file\n"; print "### autotest $Config{archname} $toolset $configuration [$defineset] coverage $1\n";
} }
else else
{ {

View File

@ -88,9 +88,9 @@ while (<>)
{ {
$results{$fulltool}{$fullconf}{result} = 0; $results{$fulltool}{$fullconf}{result} = 0;
} }
elsif ($info =~ /^coverage (\S+) (\S+)/) elsif ($info =~ /^coverage (\S+)/)
{ {
$results{$fulltool}{$fullconf}{"coverage_$1"} = $2; $results{$fulltool}{$fullconf}{coverage} = $1;
} }
else else
{ {
@ -169,13 +169,13 @@ foreach $tool (@toolsetarray)
} }
elsif ($$info{result} == 0) elsif ($$info{result} == 0)
{ {
my ($coverage_pugixml, $coverage_pugixpath) = ($$info{coverage_pugixml}, $$info{coverage_pugixpath}); my $coverage = $$info{coverage};
print "<td bgcolor='#00ff00' align='center'>pass"; print "<td bgcolor='#00ff00' align='center'>pass";
if ($coverage_pugixml > 0 || $coverage_pugixpath > 0) if ($coverage > 0)
{ {
print "<br><font size='-2'>" . ($coverage_pugixml + 0) . "%<br>" . ($coverage_pugixpath + 0) . "%</font>"; print "<br><font size='-2'>" . ($coverage + 0) . "%</font>";
} }
print "</td>"; print "</td>";