← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/test-run.pl

  • Committer: Brian Aker
  • Date: 2010-08-16 18:25:52 UTC
  • mto: (1711.1.17 build)
  • mto: This revision was merged to the branch mainline in revision 1713.
  • Revision ID: brian@tangent.org-20100816182552-exoqog7jgi1yu8ob
Update for test to run slap correctly via flags (for valgrind).

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test-run.pl
245
245
my $opt_valgrind= 0;
246
246
my $opt_valgrind_mysqld= 0;
247
247
my $opt_valgrind_drizzletest= 0;
 
248
my $opt_valgrind_drizzleslap= 0;
248
249
my @default_valgrind_args= ("--show-reachable=yes --malloc-fill=0xDEADBEEF --free-fill=0xDEADBEEF");
249
250
my @valgrind_args;
250
251
my $opt_valgrind_path;
530
531
             'gprof'                    => \$opt_gprof,
531
532
             'valgrind|valgrind-all'    => \$opt_valgrind,
532
533
             'valgrind-drizzletest'       => \$opt_valgrind_drizzletest,
 
534
             'valgrind-drizzleslap'       => \$opt_valgrind_drizzleslap,
533
535
             'valgrind-mysqld'          => \$opt_valgrind_mysqld,
534
536
             'valgrind-options=s'       => sub {
535
537
               my ($opt, $value)= @_;
884
886
    mtr_report("Turning on valgrind for drizzletest and drizzle_client_test only");
885
887
    $opt_valgrind= 1;
886
888
  }
 
889
  elsif ( $opt_valgrind_drizzleslap )
 
890
  {
 
891
    mtr_report("Turning on valgrind for drizzleslap only");
 
892
    $opt_valgrind= 1;
 
893
  }
887
894
 
888
895
  if ( $opt_callgrind )
889
896
  {
1537
1544
  # ----------------------------------------------------
1538
1545
  if ( $exe_drizzleslap )
1539
1546
  {
1540
 
    my $cmdline_drizzleslap=
1541
 
    "$glob_basedir/libtool --mode=execute valgrind --log-file=$opt_vardir/log/drizzleslap-valgrind.log " .
 
1547
    my $cmdline_drizzleslap;
 
1548
 
 
1549
    if ( $opt_valgrind_drizzleslap )
 
1550
    {
 
1551
      $cmdline_drizzleslap= "$glob_basedir/libtool --mode=execute valgrind --log-file=$opt_vardir/log/drizzleslap-valgrind.log ";
 
1552
    }
 
1553
    $cmdline_drizzleslap .=
1542
1554
      mtr_native_path($exe_drizzleslap) .
1543
1555
      " -uroot " .
1544
1556
      "--port=$master->[0]->{'port'} ";
3712
3724
  valgrind              Run the "drizzletest" and "mysqld" executables using
3713
3725
                        valgrind with default options
3714
3726
  valgrind-all          Synonym for --valgrind
3715
 
  valgrind-drizzletest    Run the "drizzletest" and "drizzle_client_test" executable
 
3727
  valgrind-drizzleslap  Run "drizzleslap" with valgrind.
 
3728
  valgrind-drizzletest  Run the "drizzletest" and "drizzle_client_test" executable
3716
3729
                        with valgrind
3717
3730
  valgrind-mysqld       Run the "mysqld" executable with valgrind
3718
3731
  valgrind-options=ARGS Deprecated, use --valgrind-option