← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysql-test/lib/mtr_cases.pl

  • Committer: Brian Aker
  • Date: 2008-07-07 14:25:25 UTC
  • mto: (77.1.25 codestyle)
  • mto: This revision was merged to the branch mainline in revision 82.
  • Revision ID: brian@tangent.org-20080707142525-xzy2nl3ie2ebwfln
LL() cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysql-test/lib/mtr_cases.pl
526
526
 
527
527
  my $tinfo= {};
528
528
  $tinfo->{'name'}= basename($suite) . ".$tname";
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
 
  }
 
529
  $tinfo->{'result_file'}= "$resdir/$tname.result";
537
530
  $tinfo->{'component_id'} = $component_id;
538
531
  push(@$cases, $tinfo);
539
532
 
629
622
      {
630
623
        # Specifies the file mysqltest should compare
631
624
        # output against
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
 
 
 
625
        $tinfo->{'result_file'}= "r/$value.result";
641
626
        next;
642
627
      }
643
628
 
816
801
      return;
817
802
    }
818
803
 
819
 
    {
 
804
    if ( $tinfo->{'ndb_test'} )
 
805
    {
 
806
      # This is a NDB test
 
807
      if ( ! $::glob_ndbcluster_supported )
 
808
      {
 
809
        # Ndb is not supported, skip it
 
810
        $tinfo->{'skip'}= 1;
 
811
        $tinfo->{'comment'}= "No ndbcluster support";
 
812
        return;
 
813
      }
 
814
      elsif ( $::opt_skip_ndbcluster )
 
815
      {
 
816
        # All ndb test's should be skipped
 
817
        $tinfo->{'skip'}= 1;
 
818
        $tinfo->{'comment'}= "No ndbcluster tests(--skip-ndbcluster)";
 
819
        return;
 
820
      }
 
821
      # Ndb tests run with two mysqld masters
 
822
      $tinfo->{'master_num'}= 2;
 
823
    }
 
824
    else
 
825
    {
 
826
      # This is not a ndb test
820
827
      if ( $::opt_with_ndbcluster_only )
821
828
      {
822
829
        # Only the ndb test should be run, all other should be skipped
826
833
      }
827
834
    }
828
835
 
 
836
    if ( $tinfo->{'innodb_test'} )
 
837
    {
 
838
      # This is a test that need innodb
 
839
      if ( $::mysqld_variables{'innodb'} ne "TRUE" )
 
840
      {
 
841
        # innodb is not supported, skip it
 
842
        $tinfo->{'skip'}= 1;
 
843
        $tinfo->{'comment'}= "No innodb support";
 
844
        return;
 
845
      }
 
846
    }
 
847
 
829
848
    if ( $tinfo->{'need_binlog'} )
830
849
    {
831
850
      if (grep(/^--skip-log-bin/,  @::opt_extra_mysqld_opt) )
867
886
  "sup_binlog_formats", ["row","statement"]],
868
887
 ["include/big_test.inc", "big_test", 1],
869
888
 ["include/have_debug.inc", "need_debug", 1],
 
889
 ["include/have_ndb.inc", "ndb_test", 1],
 
890
 ["include/have_multi_ndb.inc", "ndb_test", 1],
 
891
 ["include/have_ndb_extra.inc", "ndb_extra", 1],
 
892
 ["include/ndb_master-slave.inc", "ndb_test", 1],
870
893
 ["require_manager", "require_manager", 1],
871
894
);
872
895