svn commit: r468621 - in /lucene/lucy/trunk/perl: buildlib/Lucy/Build.pm t/100-charmonizer.t

[ma...@apache.org]

Author: marvin
Date: Fri Oct 27 20:06:03 2006
New Revision: 468621

URL: http://svn.apache.org/viewvc?view=rev&rev=468621
Log:
Enhance valgrind testing.

Modified:
    lucene/lucy/trunk/perl/buildlib/Lucy/Build.pm
    lucene/lucy/trunk/perl/t/100-charmonizer.t

Modified: lucene/lucy/trunk/perl/buildlib/Lucy/Build.pm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/perl/buildlib/Lucy/Build.pm?view=diff&rev=468621&r1=468620&r2=468621
==============================================================================
--- lucene/lucy/trunk/perl/buildlib/Lucy/Build.pm (original)
+++ lucene/lucy/trunk/perl/buildlib/Lucy/Build.pm Fri Oct 27 20:06:03 2006
@@ -21,7 +21,7 @@
 
 my $EXTRA_CCFLAGS
     = $ENV{DEBUG_CHARM} ? " -ansi -pedantic -Wall -Wextra -std=c89 " : "";
-my $VALGRIND = $ENV{CHARM_VALGRIND} ? "valgrind " : "";
+my $VALGRIND = $ENV{CHARM_VALGRIND} ? "valgrind --leak-check=full " : "";
 
 # Compile the metaquote source filter utility.
 sub ACTION_metaquote {
@@ -155,12 +155,13 @@
     my $os_name = lc( $Config{osname} );
     my $flags = "$Config{ccflags} $EXTRA_CCFLAGS";
     my $verbosity = $ENV{DEBUG_CHARM} ? 2 : 1;
+    my $cc = "$VALGRIND$Config{cc}";
     open( my $infile_fh, '>', $lucyconf_in )
         or die "Can't open '$lucyconf_in': $!";
     print $infile_fh qq|
         <charm_outpath>$lucyconf_path</charm_outpath>
         <charm_os_name>$os_name</charm_os_name>
-        <charm_cc_command>$Config{cc}</charm_cc_command>
+        <charm_cc_command>$cc</charm_cc_command>
         <charm_cc_flags>$flags</charm_cc_flags>
         <charm_verbosity>$verbosity</charm_verbosity>
     |;

Modified: lucene/lucy/trunk/perl/t/100-charmonizer.t
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/perl/t/100-charmonizer.t?view=diff&rev=468621&r1=468620&r2=468621
==============================================================================
--- lucene/lucy/trunk/perl/t/100-charmonizer.t (original)
+++ lucene/lucy/trunk/perl/t/100-charmonizer.t Fri Oct 27 20:06:03 2006
@@ -7,9 +7,10 @@
 use Env qw( @PATH );
 
 unshift @PATH, curdir();
+my $VALGRIND = $ENV{CHARM_VALGRIND} ? "valgrind --leak-check=full " : "";
 
 # capture and parse output of 'charm_test' 
-my $charm_test_output = qx|charm_test|;
+my $charm_test_output = qx|$VALGRIND charm_test|;
 $charm_test_output =~ /TOTAL FAILED:\s*(\d+)/ 
     or die "Didn't receive expected output from 'charm_test'";
 my $total_failed = $1;