From 5442ff6abaec9fa28c73b8b1c4fbf9fbecf686b0 Mon Sep 17 00:00:00 2001
From: "arseny.kapoulkine"
 <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640>
Date: Sun, 29 Aug 2010 15:34:10 +0000
Subject: tests: Fixed coverage reports

git-svn-id: http://pugixml.googlecode.com/svn/trunk@675 99668b35-9821-0410-8761-19e4c4f06640
---
 tests/autotest-local.pl  |  8 ++------
 tests/autotest-report.pl | 10 +++++-----
 2 files changed, 7 insertions(+), 11 deletions(-)

(limited to 'tests')

diff --git a/tests/autotest-local.pl b/tests/autotest-local.pl
index d2be69d..d252610 100644
--- a/tests/autotest-local.pl
+++ b/tests/autotest-local.pl
@@ -101,14 +101,10 @@ foreach $toolset (@toolsets)
 		{
 			my $configuration = $1;
 			my $defineset = ($2 eq $stddefine) ? '' : $2;
-			my $file;
 
-			$file = "pugixml $1" if (/pugixml\.cpp' executed:([^%]+)%/);
-			$file = "pugixpath $1" if (/pugixpath\.cpp' executed:([^%]+)%/);
-
-			if (defined($file))
+			if (/pugixml\.cpp' executed:([^%]+)%/)
 			{
-				print "### autotest $Config{archname} $toolset $configuration [$defineset] coverage $file\n";
+				print "### autotest $Config{archname} $toolset $configuration [$defineset] coverage $1\n";
 			}
 			else
 			{
diff --git a/tests/autotest-report.pl b/tests/autotest-report.pl
index 993674a..58f0d84 100644
--- a/tests/autotest-report.pl
+++ b/tests/autotest-report.pl
@@ -88,9 +88,9 @@ while (<>)
 		{
 			$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
 		{
@@ -169,13 +169,13 @@ foreach $tool (@toolsetarray)
 		}
 		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";
 				
-			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>";
-- 
cgit v1.2.3