← 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: 2008-08-03 22:27:54 UTC
  • mfrom: (236.1.66 codestyle)
  • Revision ID: brian@tangent.org-20080803222754-yhkw8plul06oqvhe
Merge from Monty.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test-run.pl
106
106
our $path_charsetsdir;
107
107
our $path_client_bindir;
108
108
our $path_share;
109
 
our $path_language;
110
109
our $path_timefile;
111
110
our $path_snapshot;
112
111
our $path_drizzletest_log;
636
635
  $path_client_bindir= mtr_path_exists("$glob_basedir/client",
637
636
                                       "$glob_basedir/bin");
638
637
 
639
 
  # Look for language files and charsetsdir, use same share
 
638
  # Look for charsetsdir, use same share
640
639
  $path_share=      mtr_path_exists("$glob_basedir/share/mysql",
641
640
                                    "$glob_basedir/drizzled/share",
642
641
                                    "$glob_basedir/share");
643
642
 
644
 
  $path_language=      mtr_path_exists("$path_share/english");
645
643
  $path_charsetsdir=   mtr_path_exists("$path_share/charsets");
646
644
 
647
645
 
 
646
 
648
647
  if (!$opt_extern)
649
648
  {
650
649
    $exe_drizzled=       mtr_exe_exists ("$glob_basedir/drizzled/drizzled",
1119
1118
  #
1120
1119
  # --datadir must exist, mysqld will chdir into it
1121
1120
  #
1122
 
  my $list= `$exe_drizzled --no-defaults --datadir=$tmpdir --language=$path_language --skip-grant-tables --verbose --help`;
 
1121
  my $list= `$exe_drizzled --no-defaults --datadir=$tmpdir --skip-grant-tables --verbose --help`;
1123
1122
 
1124
1123
  foreach my $line (split('\n', $list))
1125
1124
  {
2504
2503
  }
2505
2504
 
2506
2505
  mtr_add_arg($args, "%s--default-character-set=latin1", $prefix);
2507
 
  mtr_add_arg($args, "%s--language=%s", $prefix, $path_language);
2508
2506
  mtr_add_arg($args, "%s--tmpdir=$opt_tmpdir", $prefix);
2509
2507
 
2510
2508
  # Increase default connect_timeout to avoid intermittent