[popfile-commit] engine/Devel TestCoverage.pm,1.14,1.15

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/popfile/engine/Devel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14989/Devel

Modified Files:
	TestCoverage.pm 
Log Message:
Change GPL license to remove the option for the person using POPFile to license it under any version of the GPL other than v2

Index: TestCoverage.pm
===================================================================
RCS file: /cvsroot/popfile/engine/Devel/TestCoverage.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** TestCoverage.pm	8 Jun 2004 14:39:58 -0000	1.14
--- TestCoverage.pm	19 Dec 2005 11:41:53 -0000	1.15
***************
*** 1,3 ****
! # ---------------------------------------------------------------------------------------------
  #
  # Devel::TestCoverage - Module to measure code coverage in the test suite
--- 1,3 ----
! # -----------------------------------------------------------------------------
  #
  # Devel::TestCoverage - Module to measure code coverage in the test suite
***************
*** 7,14 ****
  #   This file is part of POPFile
  #
! #   POPFile is free software; you can redistribute it and/or modify
! #   it under the terms of the GNU General Public License as published by
! #   the Free Software Foundation; either version 2 of the License, or
! #   (at your option) any later version.
  #
  #   POPFile is distributed in the hope that it will be useful,
--- 7,13 ----
  #   This file is part of POPFile
  #
! #   POPFile is free software; you can redistribute it and/or modify it
! #   under the terms version 2 of the GNU General Public License as
! #   published by the Free Software Foundation.
  #
  #   POPFile is distributed in the hope that it will be useful,
***************
*** 21,56 ****
  #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  #
! # ---------------------------------------------------------------------------------------------
! 
  package Devel::TestCoverage;

  package DB;

! # This hash will store a count of the number of times each line is executed # in each file,
! # it is in fact a hash of hashes used as
  # $count{filename}{linenumber}
  my %count;

! # This is called when we begin the code coverage (or debugging) session
  BEGIN
  {
          unlink 'tests/*.lne';

!         # We want to look inside subroutines so tell the debugger to trace into
!         # them

          $DB::trace = 1;
  }

! # Perl will call this function for every line of code it executes.  We keep
! # a count for each time a line is executed
  sub DB
  {
!         # The caller function we till us what line of code, in which file and
!         # package called us
          my ($package, $file, $line) = caller;

!         # A specific line in a specific file just got executed, we remove
!         # certain references to eval code that we wont have traced into
          $count{$file}{$line} += 1 if ( ( $file =~ /\(eval/ ) == 0 );
  }
--- 20,60 ----
  #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  #
! # -----------------------------------------------------------------------------
  package Devel::TestCoverage;

  package DB;

! # This hash will store a count of the number of times each line is
! # executed # in each file, it is in fact a hash of hashes used as
  # $count{filename}{linenumber}
+ 
  my %count;

! # This is called when we begin the code coverage (or debugging)
! # session
! 
  BEGIN
  {
          unlink 'tests/*.lne';

!         # We want to look inside subroutines so tell the debugger to
!         # trace into them

          $DB::trace = 1;
  }

! # Perl will call this function for every line of code it executes.  We
! # keep a count for each time a line is executed
  sub DB
  {
!         # The caller function we till us what line of code, in which
!         # file and package called us
! 
          my ($package, $file, $line) = caller;

!         # A specific line in a specific file just got executed, we
!         # remove certain references to eval code that we wont have
!         # traced into
! 
          $count{$file}{$line} += 1 if ( ( $file =~ /\(eval/ ) == 0 );
  }
***************
*** 62,66 ****
          for my $file (keys %count)
          {
!             if ( ( $file =~ /^[^\/]/ ) && ( $file ne '../tests.pl' ) && !( $file =~ /^..\/\/Test\// ) ) {
                  my $current_line   = 0;
                  my $block_executed = 0;
--- 66,72 ----
          for my $file (keys %count)
          {
!             if ( ( $file =~ /^[^\/]/ ) &&
!                  ( $file ne '../tests.pl' ) &&
!                  !( $file =~ /^..\/\/Test\// ) ) {
                  my $current_line   = 0;
                  my $block_executed = 0;
***************
*** 72,89 ****
                  open LINE_DATA, ">$clean.$$.lne";

!                 # Read in each line of the source file and keep track of whether 
!                 # it was executed or not using a new couple of keys in the 
!                 # %count hash for each file: total_lines, total_executable_lines 
!                 # and total_executed

!                 while (<SOURCE_FILE>)
!                 {
!                         # Keep count of the total number of lines in this file

                          $current_line              += 1;

!                         # We do not count lines that are blank or exclusively 
!                         # comments or just have braces on them or
!                         # just an else or just a subroutine definition

                          if ( ( ( /^\s*\#/                   == 0 ) &&
--- 78,97 ----
                  open LINE_DATA, ">$clean.$$.lne";

!                 # Read in each line of the source file and keep track
!                 # of whether it was executed or not using a new couple
!                 # of keys in the %count hash for each file:
!                 # total_lines, total_executable_lines and
!                 # total_executed

!                 while (<SOURCE_FILE>) {
!                         # Keep count of the total number of lines in
!                         # this file

                          $current_line              += 1;

!                         # We do not count lines that are blank or
!                         # exclusively comments or just have braces on
!                         # them or just an else or just a subroutine
!                         # definition

                          if ( ( ( /^\s*\#/                   == 0 ) &&
***************
*** 91,99 ****
                                 ( /^\s*(\{|\}|else|\s)+\s*$/ == 0 ) &&
                                 ( /^\s*sub \w+( \{)?\s*$/    == 0 ) &&
!                                ( /^\s*package /             == 0 ) ) || ( $block_executed ) ) {
                              $count{$file}{total_executable_lines} += 1;

!                             # If this line was executed then keep count of
!                             # that fact

                              if ( /\# PROFILE PLATFORM START ([^\r\n]+)/ ) {
--- 99,108 ----
                                 ( /^\s*(\{|\}|else|\s)+\s*$/ == 0 ) &&
                                 ( /^\s*sub \w+( \{)?\s*$/    == 0 ) &&
!                                ( /^\s*package /             == 0 ) ) ||
!                              ( $block_executed ) ) {
                              $count{$file}{total_executable_lines} += 1;

!                             # If this line was executed then keep
!                             # count of that fact

                              if ( /\# PROFILE PLATFORM START ([^\r\n]+)/ ) {
***************
*** 101,110 ****
  		            }

!                             if ( ( $count{$file}{$current_line} > 0 ) || ( $block_executed ) ) {
                                  print LINE_DATA "1\n";

!                                 # Check to see if the special comment PROFILE BLOCK START is on the line
!                                 # and if so set the block mode where we count lines as being executed
!                                 # in the block if the first line was

                                  if ( /\# PROFILE BLOCK START/ ) {
--- 110,122 ----
  		            }

!                             if ( ( $count{$file}{$current_line} > 0 ) ||
!                                  ( $block_executed ) ) {
                                  print LINE_DATA "1\n";

!                                 # Check to see if the special comment
!                                 # PROFILE BLOCK START is on the line
!                                 # and if so set the block mode where
!                                 # we count lines as being executed in
!                                 # the block if the first line was

                                  if ( /\# PROFILE BLOCK START/ ) {
***************
*** 130,134 ****
                  close LINE_DATA;

!                 # Check for an unterminated PROFILE BLOCK and warn the user

                  if ( $block_executed ) {
--- 142,147 ----
                  close LINE_DATA;

!                 # Check for an unterminated PROFILE BLOCK and warn the
!                 # user

                  if ( $block_executed ) {