[rt #99959] fix Imager::Matrix2d::rotate()'s centre point hanling

[imager.git] / imcover.perl

diff --git a/imcover.perl b/imcover.perl
index 0e8d44ce83e2980923646236121897be7bf8b43c..5c75c4386345493365479d365111013d50d09eb4 100644 (file)
--- a/imcover.perl
+++ b/imcover.perl
@@ -3,22 +3,39 @@ use strict;
 use Config;
 use ExtUtils::Manifest 'maniread';
 use Cwd;
+use Getopt::Long;
+
+my @tests;
+my $verbose;
+my $nodc;
+my $make_opts = "";
+GetOptions("t|test=s" => \@tests,
+          "m=s" => \$make_opts,
+          "n" => \$nodc,
+          "v" => \$verbose)
+  or die;
 
 my $make = $Config{make};
 # if there's a way to make with profiling for a recursive build like
 # Imager I don't see how
 if (-f 'Makefile') {
-    system "$make clean";
+  run("$make clean");
 }
-system "cover -delete";
-system "perl Makefile.PL --coverage"
-  and die;
-system "$make 'OTHERLDFLAGS=-ftest-coverage -fprofile-arcs'"
-  and die;
+run("cover -delete");
+run("perl Makefile.PL --coverage @ARGV")
+  and die "Makefile.PL failed\n";
+run("$make $make_opts 'OTHERLDFLAGS=-ftest-coverage -fprofile-arcs'")
+  and die "build failed\n";
 
 {
-  local $ENV{DEVEL_COVER_OPTIONS} = "-db," . getcwd() . "/cover_db";
-  system "$make test TEST_VERBOSE=1 HARNESS_PERL_SWITCHES=-MDevel::Cover";
+  local $ENV{DEVEL_COVER_OPTIONS} = "-db," . getcwd() . "/cover_db,-coverage,statement,branch,condition,subroutine";
+  my $makecmd = "$make test TEST_VERBOSE=1";
+  $makecmd .= " HARNESS_PERL_SWITCHES=-MDevel::Cover" unless $nodc;
+  if (@tests) {
+    $makecmd .= " TEST_FILES='@tests'";
+  }
+  run($makecmd)
+    and die "Test failed\n";
 }
 
 # build gcov files
@@ -27,27 +44,44 @@ my $mani = maniread();
 my %paths;
 for my $filename (keys %$mani) {
   next unless $filename =~ /\.(xs|c|im)$/;
+  (my $gcda = $filename) =~ s/\.\w+$/.gcda/;
+  next unless -f $gcda;
   if ($filename =~ m!^(\w+)/(\w+\.\w+)$!) {
     push @{$paths{$1}}, $2;
   }
   else {
     push @{$paths{''}}, $filename;
   }
+  if ($filename =~ s/\.(xs|im)$/.c/) {
+    if ($filename =~ m!^(\w+)/(\w+\.\w+)$!) {
+      push @{$paths{$1}}, $2;
+    }
+    else {
+      push @{$paths{''}}, $filename;
+    }
+  }
 }
 
 for my $path (keys %paths) {
   if ($path) {
-    system "cd $path ; gcov @{$paths{$path}} ; cd ..";
+    run("cd $path ; gcov -abc @{$paths{$path}} ; cd ..");
   }
   else {
-    system "gcov @{$paths{$path}}";
+    run("gcov -abc @{$paths{$path}}");
   }
   my $dir = $path ? $path : '.';
   for my $file (@{$paths{$path}}) {
-    system "gcov2perl $dir/$file.gcov";
+    run("gcov2perl $dir/$file.gcov");
   }
 }
 
 my @dbs = "cover_db", map "$_/cover_db", grep $_, keys %paths;
-system "cover -ignore_re '^t/'";
+# we already ran gcov
+run("cover -nogcov -ignore_re '^t/'");
 
+sub run {
+  my $cmd = shift;
+
+  print "Running: $cmd\n" if $verbose;
+  return system $cmd;
+}