fixes to the fountain filter

[imager.git] / imcover.perl

diff --git a/imcover.perl b/imcover.perl
index f55c98dfc67f9268763b189e041c7a99f0478773..ed8658936293b1321dbe7fc49a512a868ad6c8dd 100644 (file)
--- a/imcover.perl
+++ b/imcover.perl
@@ -8,31 +8,40 @@ use Getopt::Long;
 my @tests;
 my $verbose;
 my $nodc;
+my $make_opts = "";
+my $regen_only;
 GetOptions("t|test=s" => \@tests,
+          "m=s" => \$make_opts,
           "n" => \$nodc,
-          "v" => \$verbose)
+          "v" => \$verbose,
+          "r" => \$regen_only)
   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') {
-  run("$make clean");
-}
-run("cover -delete");
-run("perl Makefile.PL --coverage @ARGV")
-  and die;
-run("$make 'OTHERLDFLAGS=-ftest-coverage -fprofile-arcs'")
-  and die;
-
-{
-  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'";
+my $do_build = !$regen_only;
+if ($do_build) {
+  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') {
+    run("$make clean");
+  }
+  run("cover -delete");
+  run("$^X 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,-coverage,statement,branch,condition,subroutine";
+    my $makecmd = "$make test";
+    $makecmd .= " TEST_VERBOSE=1" if $verbose;
+    $makecmd .= " HARNESS_PERL_SWITCHES=-MDevel::Cover" unless $nodc;
+    if (@tests) {
+      $makecmd .= " TEST_FILES='@tests'";
+    }
+    run($makecmd)
+      and die "Test failed\n";
   }
-  run($makecmd);
 }
 
 # build gcov files
@@ -41,14 +50,26 @@ 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;
+    }
+  }
 }
 
+my $gcov2perl = $Config{sitebin} . "/gcov2perl";
+
 for my $path (keys %paths) {
   if ($path) {
     run("cd $path ; gcov -abc @{$paths{$path}} ; cd ..");
@@ -58,7 +79,7 @@ for my $path (keys %paths) {
   }
   my $dir = $path ? $path : '.';
   for my $file (@{$paths{$path}}) {
-    run("gcov2perl $dir/$file.gcov");
+    run("$gcov2perl $dir/$file.gcov");
   }
 }
 
@@ -72,3 +93,18 @@ sub run {
   print "Running: $cmd\n" if $verbose;
   return system $cmd;
 }
+
+=head1 NAME
+
+imcover.perl - perform C and perl coverage testing for Imager
+
+=head1 SYNOPSIS
+
+  perl imcover.perl [-m=...][-t=...][-n][-v][-r] -- ... Makefile.PL options
+
+=head1 DESCRIPTION
+
+Builds Imager with the C< -ftest-coverage -fprofile-arcs > gcc options
+and then runs perl's tests.
+
+=cut