← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/lib/mtr_cases.pl

  • Committer: Monty Taylor
  • Date: 2009-03-24 17:44:41 UTC
  • mto: (960.5.2 mordred)
  • mto: This revision was merged to the branch mainline in revision 964.
  • Revision ID: mordred@inaugust.com-20090324174441-nmsq0gwjlgf7f0mt
Changed handlerton to StorageEngine.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/lib/mtr_cases.pl
141
141
        #
142
142
        # Append the criteria for sorting, in order of importance.
143
143
        #
144
 
        push(@criteria, "ndb=" . ($tinfo->{'ndb_test'} ? "1" : "0"));
145
144
        # Group test with equal options together.
146
145
        # Ending with "~" makes empty sort later than filled
147
146
        push(@criteria, join("!", sort @{$tinfo->{'master_opt'}}) . "~");
526
525
 
527
526
  my $tinfo= {};
528
527
  $tinfo->{'name'}= basename($suite) . ".$tname";
529
 
  $tinfo->{'result_file'}= "$resdir/$tname.result";
 
528
  if ( -f "$resdir/$::opt_engine/$tname.result")
 
529
  {
 
530
    $tinfo->{'result_file'}= "$resdir/$::opt_engine/$tname.result";
 
531
  }
 
532
  else
 
533
  {
 
534
    $tinfo->{'result_file'}= "$resdir/$tname.result";
 
535
  }
530
536
  $tinfo->{'component_id'} = $component_id;
531
537
  push(@$cases, $tinfo);
532
538
 
622
628
      {
623
629
        # Specifies the file mysqltest should compare
624
630
        # output against
625
 
        $tinfo->{'result_file'}= "r/$value.result";
 
631
        if ( -f "r/$::opt_engine/$value.result")
 
632
        {
 
633
          $tinfo->{'result_file'}= "r/$::opt_engine/$value.result";
 
634
        }
 
635
        else
 
636
        {
 
637
          $tinfo->{'result_file'}= "r/$value.result";
 
638
        }
 
639
 
626
640
        next;
627
641
      }
628
642
 
800
814
      $tinfo->{'comment'}= "Test need debug binaries";
801
815
      return;
802
816
    }
803
 
 
804
 
    {
805
 
      if ( $::opt_with_ndbcluster_only )
806
 
      {
807
 
        # Only the ndb test should be run, all other should be skipped
808
 
        $tinfo->{'skip'}= 1;
809
 
        $tinfo->{'comment'}= "Only ndbcluster tests(--with-ndbcluster-only)";
810
 
        return;
811
 
      }
812
 
    }
813
 
 
814
 
    if ( $tinfo->{'need_binlog'} )
815
 
    {
816
 
      if (grep(/^--skip-log-bin/,  @::opt_extra_mysqld_opt) )
817
 
      {
818
 
        $tinfo->{'skip'}= 1;
819
 
        $tinfo->{'comment'}= "Test need binlog";
820
 
        return;
821
 
      }
822
 
    }
823
 
    else
824
 
    {
825
 
      if ( $::mysql_version_id >= 50100 )
826
 
      {
827
 
        # Test does not need binlog, add --skip-binlog to
828
 
        # the options used when starting it
829
 
        push(@{$tinfo->{'master_opt'}}, "--skip-log-bin");
830
 
      }
831
 
    }
832
 
 
833
817
  }
834
818
}
835
819