Changeset 340bd709cb5031fcc12fc5f7d3fae191ec716b7c

Timestamp:

04/25/08 13:08:46 (9 months ago)

Author:

David Balmain <dbalmain@…>

Parents:

ea6c371194730654bebe8dce00285a87789ce06a

Children:

53eafd97a7caf432dce29b625005d7e028ae5b62

git-committer:

David Balmain <dbalmain@gmail.com> / 2008-04-25T13:08:46Z+1000

Message:

Updated rake gcov task to print total coverage

Location:

c

Files:

• .rake/gcov_results.erb (modified) (1 diff)
• Rakefile (modified) (5 diffs)

c/.rake/gcov_results.erb

@@ -16 +16 @@
     <h1>Ferret gcov Results</h1>
     <table cellpadding="0" cellspacing="5">
-    <% $gcov_results.each do |percent, line_cnt, filename| %>
+    <% gcov_sorted_keys.each do |fn| %>
       <tr>
-        <th class="filename"><%= filename %></th>
+        <th class="filename"><%= fn %></th>
         <td class="result">
-          <div class="bar" style="width:<%=percent%>%;">&nbsp;<div>
+          <div class="bar" style="width:<%=$gcov_results.files[fn].percent%>%;">&nbsp;<div>
         </td>
       </tr>

c/Rakefile

@@ -3 +3 @@
 require 'rake'
 require 'rake/clean'
+require 'ostruct'
 
 class String
@@ -105 +106 @@
   basename
 end
-$gcov_results   = []
+
+$gcov_results   = OpenStruct.new(:files => {})
+def gcov_sorted_keys
+  $gcov_results.files.keys.sort_by {|fn|
+      $gcov_results.files[fn].percent
+  }.reverse
+end
 
 ###
@@ -229 +236 @@
 task :gcov => :do_gcov do
   puts "\ngcov Results\n=============\n"
-  $gcov_results.each do |percent, line_cnt, fn|
-    puts "%25s %6.2f%% (%4d)" % [fn, percent, line_cnt]
-  end
+  total_lines = 0
+  total_lines_covered = 0
+  gcov_sorted_keys.each do |fn|
+    res = $gcov_results.files[fn]
+    puts "%25s %6.2f%% (%4d)" % [fn, res.percent, res.line_count]
+  end
+  puts "Total Lines:         %s" % $gcov_results.total_lines
+  puts "Total Lines covered: %s (%0.2f%%)" % 
+            [$gcov_results.covered_lines, $gcov_results.percent]
 end
 
@@ -244 +257 @@
   CFLAGS << " -fprofile-arcs -ftest-coverage"
   run_tests
-  gcov_results = []
+  gcov_result_map = {}
   gcov_scanner = /File '([^']+)'\nLines executed:(\d+.\d+)% of (\d+)/
+  total_lines = covered_lines = 0
   OBJS.each do |obj|
     bn = obj.pathmap('%n')
@@ -256 +270 @@
     gcov_cmd = "gcov -o .gcov/ #{obj}"
     details = IO.popen(gcov_cmd).read.scan(gcov_scanner)
-    details.each do |filename, percent, line_cnt|
+    details.each do |filename, percent, line_count|
       next if filename =~ /^\//
-      $gcov_results << [percent.to_f, line_cnt, filename]
-    end
-  end
-  $gcov_results = $gcov_results.sort_by{|res| res[0]}.reverse
+      line_count = line_count.to_i
+      percent = percent.to_f
+      $gcov_results.files[filename] = OpenStruct.new(:percent => percent,
+                                                     :line_count => line_count)
+      total_lines += line_count
+      covered_lines += (0.01 * percent * line_count).to_i
+    end
+  end
+  $gcov_results.total_lines = total_lines
+  $gcov_results.covered_lines = covered_lines
+  $gcov_results.percent = 100.0 * covered_lines /total_lines
 end