← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/test-run.pl

  • Committer: Monty Taylor
  • Date: 2010-06-19 21:25:32 UTC
  • mfrom: (1627.2.5 build)
  • Revision ID: mordred@inaugust.com-20100619212532-2e4bd11tm4plya7q
Rollup patch featuring: boost::program_options support for plugins, a
valgrind fix, a bugfix for password processing and a few build fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test-run.pl
118
118
our $path_my_basedir;
119
119
 
120
120
our $opt_vardir;                 # A path but set directly on cmd line
 
121
our $opt_top_srcdir;
 
122
our $opt_top_builddir;
121
123
our $path_vardir_trace;          # unix formatted opt_vardir for trace files
122
124
our $opt_tmpdir;                 # A path but set directly on cmd line
123
125
our $opt_suitepath;
126
128
our $opt_subunit;
127
129
 
128
130
our $default_vardir;
 
131
our $default_top_srcdir;
 
132
our $default_top_builddir;
129
133
 
130
134
our $opt_usage;
131
135
our $opt_suites;
557
561
             # Directories
558
562
             'tmpdir=s'                 => \$opt_tmpdir,
559
563
             'vardir=s'                 => \$opt_vardir,
 
564
             'top-builddir=s'           => \$opt_top_builddir,
 
565
             'top-srcdir=s'             => \$opt_top_srcdir,
560
566
             'suitepath=s'              => \$opt_suitepath,
561
567
             'testdir=s'                => \$opt_testdir,
562
568
             'benchdir=s'               => \$glob_mysql_bench_dir,
620
626
    $glob_mysql_test_dir= $opt_testdir;
621
627
  }
622
628
  $default_vardir= "$glob_mysql_test_dir/var";
 
629
  $default_top_srcdir= "$glob_mysql_test_dir/..";
 
630
  $default_top_builddir= "$glob_mysql_test_dir/..";
623
631
 
624
632
  if ( ! $opt_suitepath )
625
633
  {
776
784
    $opt_vardir= $default_vardir;
777
785
  }
778
786
 
 
787
  if ( ! $opt_top_srcdir )
 
788
  {
 
789
    $opt_top_srcdir= $default_top_srcdir;
 
790
  }
 
791
  else
 
792
  {
 
793
    $opt_top_srcdir= rel2abs($opt_top_srcdir);
 
794
  }
 
795
 
 
796
  if ( ! $opt_top_builddir )
 
797
  {
 
798
    $opt_top_builddir= $default_top_builddir;
 
799
  }
 
800
  else
 
801
  {
 
802
    $opt_top_builddir= rel2abs($opt_top_builddir);
 
803
  }
 
804
 
779
805
  $path_vardir_trace= $opt_vardir;
780
806
  # Chop off any "c:", DBUG likes a unix path ex: c:/src/... => /src/...
781
807
  $path_vardir_trace=~ s/^\w://;
1459
1485
  $ENV{'USE_RUNNING_SERVER'}= $opt_extern;
1460
1486
  $ENV{'DRIZZLE_TEST_DIR'}=     collapse_path($glob_mysql_test_dir);
1461
1487
  $ENV{'MYSQLTEST_VARDIR'}=   $opt_vardir;
 
1488
  $ENV{'TOP_SRCDIR'}= $opt_top_srcdir;
 
1489
  $ENV{'TOP_BUILDDIR'}= $opt_top_builddir;
1462
1490
  $ENV{'DRIZZLE_TMP_DIR'}=      $opt_tmpdir;
1463
1491
  $ENV{'MASTER_MYSOCK'}=      $master->[0]->{'path_sock'};
1464
1492
  $ENV{'MASTER_MYSOCK1'}=     $master->[1]->{'path_sock'};