← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/test-run.pl

MErge Monty.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test-run.pl
99
99
 
100
100
# Misc global variables
101
101
our $mysql_version_id;
 
102
our $glob_suite_path=             undef;
102
103
our $glob_mysql_test_dir=         undef;
103
104
our $glob_mysql_bench_dir=        undef;
104
105
our $glob_scriptname=             undef;
119
120
our $opt_vardir;                 # A path but set directly on cmd line
120
121
our $path_vardir_trace;          # unix formatted opt_vardir for trace files
121
122
our $opt_tmpdir;                 # A path but set directly on cmd line
 
123
our $opt_suitepath;
122
124
our $opt_testdir;
123
125
 
124
126
our $opt_subunit;
551
553
             # Directories
552
554
             'tmpdir=s'                 => \$opt_tmpdir,
553
555
             'vardir=s'                 => \$opt_vardir,
554
 
             'testdir=s'                => \$opt_testdir,
 
556
             'suitepath=s'              => \$opt_suitepath,
 
557
             'testdir=s'                => \$opt_testdir,
555
558
             'benchdir=s'               => \$glob_mysql_bench_dir,
556
559
             'mem'                      => \$opt_mem,
557
560
 
614
617
  }
615
618
  $default_vardir= "$glob_mysql_test_dir/var";
616
619
 
 
620
  if ( ! $opt_suitepath )
 
621
  {
 
622
    $glob_suite_path= "$glob_mysql_test_dir/../plugin";
 
623
  }
 
624
  else
 
625
  {
 
626
    $glob_suite_path= $opt_suitepath;
 
627
  }
617
628
  # In most cases, the base directory we find everything relative to,
618
629
  # is the parent directory of the "mysql-test" directory. For source
619
630
  # distributions, TAR binary distributions and some other packages.