← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/test-run.pl

  • Committer: lbieber
  • Date: 2010-09-22 03:02:24 UTC
  • mfrom: (1782.2.4 bug643815)
  • mto: This revision was merged to the branch mainline in revision 1784.
  • Revision ID: lbieber@orisndriz08-20100922030224-h3fbwxmf3rhrg4r9
Merge Monty - fix bug 643814 - add links for drizzle7 changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test-run.pl
653
653
  }
654
654
 
655
655
  if ( $opt_testdir and -d $opt_testdir and $opt_vardir and -d $opt_vardir
656
 
         and -f "$opt_vardir/../../drizzled/drizzled7")
 
656
         and -f "$opt_vardir/../../drizzled/drizzled")
657
657
  {
658
658
    # probably in a VPATH build
659
659
    $glob_builddir= "$opt_vardir/../..";
683
683
 
684
684
  if (!$opt_extern)
685
685
  {
686
 
    $exe_drizzled=       mtr_exe_exists ("$glob_basedir/drizzled/drizzled7",
687
 
                                       "$path_client_bindir/drizzled7",
688
 
                                       "$glob_basedir/libexec/drizzled7",
689
 
                                       "$glob_basedir/bin/drizzled7",
690
 
                                       "$glob_basedir/sbin/drizzled7",
691
 
                                       "$glob_builddir/drizzled/drizzled7");
 
686
    $exe_drizzled=       mtr_exe_exists ("$glob_basedir/drizzled/drizzled",
 
687
                                       "$path_client_bindir/drizzled",
 
688
                                       "$glob_basedir/libexec/drizzled",
 
689
                                       "$glob_basedir/bin/drizzled",
 
690
                                       "$glob_basedir/sbin/drizzled",
 
691
                                       "$glob_builddir/drizzled/drizzled");
692
692
 
693
693
    # Use the drizzled found above to find out what features are available
694
694
    collect_mysqld_features();