~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/lib/mtr_cases.pl

  • Committer: Monty Taylor
  • Date: 2008-10-13 09:29:43 UTC
  • mfrom: (509 drizzle)
  • mto: (509.1.4 codestyle)
  • mto: This revision was merged to the branch mainline in revision 511.
  • Revision ID: monty@inaugust.com-20081013092943-rwvx4a6d85b5l2dh
MergedĀ inĀ trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
526
526
 
527
527
  my $tinfo= {};
528
528
  $tinfo->{'name'}= basename($suite) . ".$tname";
529
 
  $tinfo->{'result_file'}= "$resdir/$tname.result";
 
529
  if ( -f "$resdir/$::opt_engine/$tname.result")
 
530
  {
 
531
    $tinfo->{'result_file'}= "$resdir/$::opt_engine/$tname.result";
 
532
  }
 
533
  else
 
534
  {
 
535
    $tinfo->{'result_file'}= "$resdir/$tname.result";
 
536
  }
530
537
  $tinfo->{'component_id'} = $component_id;
531
538
  push(@$cases, $tinfo);
532
539
 
622
629
      {
623
630
        # Specifies the file mysqltest should compare
624
631
        # output against
625
 
        $tinfo->{'result_file'}= "r/$value.result";
 
632
        if ( -f "r/$::opt_engine/$value.result")
 
633
        {
 
634
          $tinfo->{'result_file'}= "r/$::opt_engine/$value.result";
 
635
        }
 
636
        else
 
637
        {
 
638
          $tinfo->{'result_file'}= "r/$value.result";
 
639
        }
 
640
 
626
641
        next;
627
642
      }
628
643