← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/test-run.pl

  • Committer: Stewart Smith
  • Date: 2009-12-21 05:34:07 UTC
  • mto: This revision was merged to the branch mainline in revision 1251.
  • Revision ID: stewart@flamingspork.com-20091221053407-6wk82jcu1qhty5dh
add option to test-run.pl to run with massif valgrind tool

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test-run.pl
244
244
my @valgrind_args;
245
245
my $opt_valgrind_path;
246
246
my $opt_callgrind;
 
247
my $opt_massif;
247
248
 
248
249
our $opt_stress=               "";
249
250
our $opt_stress_suite=     "main";
538
539
             'valgrind-option=s'        => \@valgrind_args,
539
540
             'valgrind-path=s'          => \$opt_valgrind_path,
540
541
             'callgrind'                => \$opt_callgrind,
 
542
             'massif'                   => \$opt_massif,
541
543
 
542
544
             # Stress testing 
543
545
             'stress'                   => \$opt_stress,
866
868
      unless @valgrind_args;
867
869
  }
868
870
 
 
871
  if ( $opt_massif )
 
872
  {
 
873
    mtr_report("Valgrind with Massif tool for drizzled(s)");
 
874
    $opt_valgrind= 1;
 
875
    $opt_valgrind_mysqld= 1;
 
876
  }
 
877
 
869
878
  if ( $opt_valgrind )
870
879
  {
871
880
    # Set valgrind_options to default unless already defined
3424
3433
    mtr_add_arg($args, "--tool=callgrind");
3425
3434
    mtr_add_arg($args, "--base=$opt_vardir/log");
3426
3435
  }
 
3436
  elsif ($opt_massif)
 
3437
  {
 
3438
    mtr_add_arg($args, "--tool=massif");
 
3439
  }
3427
3440
  else
3428
3441
  {
3429
3442
    mtr_add_arg($args, "--tool=memcheck"); # From >= 2.1.2 needs this option
3613
3626
                        can be specified more then once
3614
3627
  valgrind-path=[EXE]   Path to the valgrind executable
3615
3628
  callgrind             Instruct valgrind to use callgrind
 
3629
  massif                Instruct valgrind to use massif
3616
3630
 
3617
3631
Misc options
3618
3632