gcov2x 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffc25780e4cd8a34e6bdd34e5bc8e5e994b97bad
-  data.tar.gz: cb9bf064b36beeea8d7c4049160ac6b1ac7446ac
+  metadata.gz: 58d688ca8f1b4d87a11eefe33917c15c194db646
+  data.tar.gz: 23ceb0bd68c3f8bd06fcf993d40e2d4c67e35f09
 SHA512:
-  metadata.gz: 78ba1059c5cbdc8e892a7e1c83e65b3a6225fef14816d9f39a7607f4fc0af3f7426a94e8d6be0a9c0275bdaaa6f7fefdaadf67586a52e0d0a79705b0454cf77f
-  data.tar.gz: 1d42409446b10421d95fad13fdef204680e7b960313f5c6ce57c40fee67c2943f3f2241d03f461e8a676aae9bb3431c8908c5a5c5d96bb5493363995e4924dc7
+  metadata.gz: c88533951e3585ab3ff227086576bcbdb5ec0c92f0a6e3635143bf206a4a63f6d251f765c52b99f261511c28f3ad1b87614025396b35cc12c82e0162b311893f
+  data.tar.gz: 98dd31b4a441f6b2c37a92ef71fa9c5b54da9aec7e8dbe0532491edf403e8333de8ab4b27c9dc556d6876226c73c8401a9f543c63ff183a3da4d3ba0091a8fb3

data/Gemfile

@@ -1 +1,3 @@
+source 'https://rubygems.org'
+
 gemspec

data/lib/file.rb

@@ -71,8 +71,7 @@ module GCOV
 
     end
 
-    def <<(line)
-      fail "need to be in add_lines block" unless @adding
+    def _add_line line
       if line.number == 0
         key,val = /([^:]+):(.*)$/.match(line.text).to_a[1..2]
         @meta[key] = val
@@ -81,16 +80,33 @@ module GCOV
       end
     end
 
+    def <<(line)
+      fail "need to be in add_lines block" unless @adding
+      _add_line line
+    end
+
     def self.load filename
-      file = GCOV::File.new filename
+      files = []
+      file = nil
       ::File.open(filename, "r") do |file_handle|
-        file.add_lines do
-          file_handle.each_line do |line|
-            file << GCOV::Line.parse(line)
-          end
-        end
-      end
-      file
+        file_handle.each_line do |line_|
+          line = GCOV::Line.parse(line_)
+          if line.number == 0
+            key,val = /([^:]+):(.*)$/.match(line.text).to_a[1..2]
+            if key == 'Source'
+              if !file.nil?
+                file._update_stats
+                files << file
+              end # if
+              file = GCOV::File.new val
+            end # if source
+          end # if line == 0
+          file._add_line line
+        end # each line
+      end# file_handle
+      file._update_stats
+      files << file
+      files
     end
 
     def self.demangle filename

data/lib/project.rb

@@ -83,21 +83,25 @@ module GCOV
         
         filenames.select{ |filename| 
           hash[:filter].nil? or hash[:filter].empty? or hash[:filter].select{|f| f.match(GCOV::File.demangle(filename) ) }.empty?  
-        }.map{|filename| GCOV::File.load filename }.each do |file|
-          if hash[:filter].nil? or hash[:filter].empty? or hash[:filter].select{|f| f.match(::Pathname.new(file.meta['Source']).cleanpath.to_s) }.empty?
-            self << file
-          end
-        end # files
+        }.map{|filename| GCOV::File.load filename }.each do |files|
+          files.each do |file|
+            if hash[:filter].nil? or hash[:filter].empty? or hash[:filter].select{|f| f.match(::Pathname.new(file.meta['Source']).cleanpath.to_s) }.empty?
+              self << file
+            end # if
+          end # each file
+        end # each file(s)
       end
     end
 
     def add_file path, hash={}
       add_files do
         if hash[:filter].nil? or !hash[:filter].match(GCOV::File.demangle(path)) 
-          file = GCOV::File.load(path)
-          if hash[:filter].nil? or !hash[:filter].match( ::Pathname.new(file.meta['Source']).cleanpath.to_s )
-            self << file
-          end # if
+          files = GCOV::File.load(path)
+          files.each do |file|
+            if hash[:filter].nil? or !hash[:filter].match( ::Pathname.new(file.meta['Source']).cleanpath.to_s )
+              self << file
+            end # if
+          end
         end # if
       end # add_files
     end # add_file

data/lib/version.rb

@@ -1,3 +1,3 @@
 module GCOV
-  VERSION = '0.4.4'
+  VERSION = '0.5.0'
 end

data/spec/gcov2x/concat/test_cat.cpp.gcov

@@ -0,0 +1,35 @@
+        -:    0:Source:test.cpp
+        -:    0:Graph:test.gcno
+        -:    0:Data:test.gcda
+        -:    0:Runs:1
+        -:    0:Programs:1
+        -:    1:#include "test.h"
+        -:    2:
+        -:    3:int main( int argc, const char* argv[] )
+        -:    4:{
+        1:    5:    reached(2);
+        1:    6:    reached2(2);
+        1:    7:    reached3(2);
+        1:    8:    return 0;
+        -:    9:}
+        -:    0:Source:test1.cpp
+        -:    0:Graph:test1.gcno
+        -:    0:Data:test1.gcda
+        -:    0:Runs:2
+        -:    0:Programs:1
+        -:    1:
+        -:    2:int reached( int i )
+        -:    3:{
+        2:    4:    int j = i;
+        -:    5:
+        2:    6:    if( j == 2 )
+        2:    7:        return j;
+        -:    8:    
+    #####:    9:    return 3;
+        2:   10:}
+        -:   11:
+        -:   12:int unreached( int x )
+        -:   13:{
+    #####:   14:    int y = x;
+    #####:   15:    return y+3;
+        -:   16:}

data/spec/gcov2x/file_spec.rb

@@ -77,11 +77,23 @@ describe GCOV::File do
 
   describe ".load" do
     it "can load a gcov file" do
-      file = GCOV::File.load(File.join(File.dirname(__FILE__),"data/test.cpp.gcov"))
+      file = GCOV::File.load(File.join(File.dirname(__FILE__),"data/test.cpp.gcov"))[0]
       expect(file.lines.count).to eq(9)
       expect(file.meta["Graph"]).to eq("test.gcno")
       expect(file.meta["Runs"].to_i).to eq(1)
     end
+
+    it "should split concatenated gcov files into multiple objects" do
+      files = GCOV::File.load(File.join(File.dirname(__FILE__),"concat/test_cat.cpp.gcov"))
+      
+      expect(files.count).to eq(2)
+      expect(files[0].meta["Source"]).to eq("test.cpp")
+      expect(files[1].meta["Source"]).to eq("test1.cpp")
+
+      expect(files[0].lines.count).to eq(9)
+      expect(files[0].meta["Graph"]).to eq("test.gcno")
+      expect(files[0].meta["Runs"].to_i).to eq(1)
+    end
   end
 
   describe ".demangle" do

data/spec/gcov2x/project_spec.rb

@@ -41,15 +41,15 @@ describe GCOV::Project do
     it "loads all files in the given directory" do
       project = GCOV::Project.load_dir(File.join(File.dirname(__FILE__),"data"))
       expect(project.files.count).to eq(3)
-      expect(project.files.map{|file|file.name}).to include(a_string_ending_with("test2.cpp.gcov"))
-      expect(project.files.map{|file|file.name}).not_to include(a_string_ending_with("test3.cpp.gcov"))
+      expect(project.files.map{|file|file.name}).to include(a_string_ending_with("test2.cpp"))
+      expect(project.files.map{|file|file.name}).not_to include(a_string_ending_with("test3.cpp"))
     end
     
     it "recursively loads all files in the given directory structure" do
       project = GCOV::Project.load_dir(File.join(File.dirname(__FILE__),"data"), :recursive => true)
       expect(project.files.count).to eq(4)
-      expect(project.files.map{|file|file.name}).to include(a_string_ending_with("test2.cpp.gcov"))
-      expect(project.files.map{|file|file.name}).to include( a_string_ending_with("test3.cpp.gcov") )
+      expect(project.files.map{|file|file.name}).to include(a_string_ending_with("test2.cpp"))
+      expect(project.files.map{|file|file.name}).to include( a_string_ending_with("test3.cpp") )
     end
 
   end
@@ -58,7 +58,7 @@ describe GCOV::Project do
     it "adds the given file" do
       project = GCOV::Project.new
       project.add_file(File.join(File.dirname(__FILE__),"data","test2.cpp.gcov"))
-      expect(project.files.map{|file|file.name}).to include( a_string_ending_with("test2.cpp.gcov") )
+      expect(project.files.map{|file|file.name}).to include( a_string_ending_with("test2.cpp") )
     end
   end
 
@@ -67,32 +67,32 @@ describe GCOV::Project do
       project = GCOV::Project.load_dir(File.join(File.dirname(__FILE__),"data","data2"))
       project.add_dir(File.join(File.dirname(__FILE__),"data"))
       expect(project.files.count).to eq(4)
-      expect(project.files.map{|file|file.name}).to include( a_string_ending_with("test2.cpp.gcov") )
-      expect(project.files.map{|file|file.name}).to include( a_string_ending_with("test3.cpp.gcov") )
+      expect(project.files.map{|file|file.name}).to include( a_string_ending_with("test2.cpp") )
+      expect(project.files.map{|file|file.name}).to include( a_string_ending_with("test3.cpp") )
     end
 
     it "recursively adds all files in the given directory" do
       project = GCOV::Project.new
       project.add_dir(File.join(File.dirname(__FILE__),"data"), :recursive => true)
       expect(project.files.count).to eq(4)
-      expect(project.files.map{|file|file.name}).to include( a_string_ending_with("test2.cpp.gcov") )
-      expect(project.files.map{|file|file.name}).to include( a_string_ending_with("test3.cpp.gcov") )
+      expect(project.files.map{|file|file.name}).to include( a_string_ending_with("test2.cpp") )
+      expect(project.files.map{|file|file.name}).to include( a_string_ending_with("test3.cpp") )
     end
 
     it "filters using given singular expression" do
       project = GCOV::Project.new
       project.add_dir(File.join(File.dirname(__FILE__),"data"), :recursive => true, :filter => /test2\.cpp/)
       expect(project.files.count).to eq(3)
-      expect(project.files.map{|file|file.name}).not_to include( a_string_ending_with("test2.cpp.gcov") )
-      expect(project.files.map{|file|file.name}).to include( a_string_ending_with("test3.cpp.gcov") )
+      expect(project.files.map{|file|file.name}).not_to include( a_string_ending_with("test2.cpp") )
+      expect(project.files.map{|file|file.name}).to include( a_string_ending_with("test3.cpp") )
     end
 
     it "filters using given array of expressions" do
       project = GCOV::Project.new
       project.add_dir(File.join(File.dirname(__FILE__),"data"), :recursive => true, :filter => [/test2\.cpp/,/test3\.cpp/])
       expect(project.files.count).to eq(2)
-      expect(project.files.map{|file|file.name}).not_to include( a_string_ending_with("test2.cpp.gcov") )
-      expect(project.files.map{|file|file.name}).not_to include( a_string_ending_with("test3.cpp.gcov") )
+      expect(project.files.map{|file|file.name}).not_to include( a_string_ending_with("test2.cpp") )
+      expect(project.files.map{|file|file.name}).not_to include( a_string_ending_with("test3.cpp") )
     end
   end
 

data/src/Makefile

@@ -2,22 +2,28 @@ CXX=clang++
 CFLAGS=-I. --coverage
 DEPS = test.h
 OBJ = test.o test1.o test2.o test3.o
-OUTDIR = ../spec/data
+SPECDIR = ../spec/gcov2x
+OUTDIR = $(SPECDIR)/data
+OUTDIR_CAT = $(SPECDIR)/concat
 
-all: $(OUTDIR)/test.cpp.gcov $(OUTDIR)/test1.cpp.gcov $(OUTDIR)/test2.cpp.gcov $(OUTDIR)/data2/test3.cpp.gcov
+all: $(OUTDIR)/test.cpp.gcov $(OUTDIR)/test1.cpp.gcov $(OUTDIR)/test2.cpp.gcov $(OUTDIR)/data2/test3.cpp.gcov $(OUTDIR)/data2/test3.cpp.gcov $(OUTDIR_CAT)/test_cat.cpp.gcov
 
-$(OUTDIR)/test.cpp.gcov: test.cpp.gcov
+$(OUTDIR)/test.cpp.gcov: test.cpp.gcov $(OUTDIR)
 	@cp -fv $< $@
 
-$(OUTDIR)/test1.cpp.gcov: test1.cpp.gcov
+$(OUTDIR)/test1.cpp.gcov: test1.cpp.gcov $(OUTDIR)
 	@cp -fv $< $@
 
-$(OUTDIR)/test2.cpp.gcov: test2.cpp.gcov
+$(OUTDIR)/test2.cpp.gcov: test2.cpp.gcov $(OUTDIR)
 	@cp -fv $< $@
 
-$(OUTDIR)/data2/test3.cpp.gcov: test3.cpp.gcov
+$(OUTDIR)/data2/test3.cpp.gcov: test3.cpp.gcov $(OUTDIR)/data2
 	@cp -fv $< $@
 
+$(OUTDIR_CAT)/test_cat.cpp.gcov: test.cpp.gcov test1.cpp.gcov
+	@echo "\nCreating $@\n"
+	@cat $^ > $@
+
 %.cpp.gcov: %.cpp test
 	@./test
 	@llvm-cov -l -p $<
@@ -28,6 +34,15 @@ test: $(OBJ)
 %.o: %.cpp $(DEPS)
 	$(CXX) $(CFLAGS) -c -o $@ $< 
 
+$(OUTDIR):
+	mkdir -p $(OUTDIR)
+
+$(OUTDIR)/data2:
+	mkdir -p $(OUTDIR)/data2
+
+$(OUTDIR_CAT):
+	mkdir -p $(OUTDIR_CAT)
+
 clean:
 	@rm -f *.o *.gcda *.gcno *.gcov
 	@rm -f test

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gcov2x
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Mattias Bergbom
@@ -148,6 +148,7 @@ files:
 - lib/project.rb
 - lib/version.rb
 - lib/xml_formatter.rb
+- spec/gcov2x/concat/test_cat.cpp.gcov
 - spec/gcov2x/data/data2/test3.cpp.gcov
 - spec/gcov2x/data/test.cpp.gcov
 - spec/gcov2x/data/test1.cpp.gcov