← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/lib/mtr_cases.pl

  • Committer: Brian Aker
  • Date: 2008-10-06 06:47:29 UTC
  • Revision ID: brian@tangent.org-20081006064729-2i9mhjkzyvow9xsm
Remove uint.

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"));
144
145
        # Group test with equal options together.
145
146
        # Ending with "~" makes empty sort later than filled
146
147
        push(@criteria, join("!", sort @{$tinfo->{'master_opt'}}) . "~");
525
526
 
526
527
  my $tinfo= {};
527
528
  $tinfo->{'name'}= basename($suite) . ".$tname";
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
 
  }
 
529
  $tinfo->{'result_file'}= "$resdir/$tname.result";
536
530
  $tinfo->{'component_id'} = $component_id;
537
531
  push(@$cases, $tinfo);
538
532
 
628
622
      {
629
623
        # Specifies the file mysqltest should compare
630
624
        # output against
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
 
 
 
625
        $tinfo->{'result_file'}= "r/$value.result";
640
626
        next;
641
627
      }
642
628
 
787
773
        if ( $::used_default_engine =~ /^innodb/i );
788
774
    }
789
775
 
 
776
    if ( $tinfo->{'big_test'} and ! $::opt_big_test )
 
777
    {
 
778
      $tinfo->{'skip'}= 1;
 
779
      $tinfo->{'comment'}= "Test need 'big-test' option";
 
780
      return;
 
781
    }
 
782
 
790
783
    if ( $tinfo->{'ndb_extra'} and ! $::opt_ndb_extra_test )
791
784
    {
792
785
      $tinfo->{'skip'}= 1;
807
800
      $tinfo->{'comment'}= "Test need debug binaries";
808
801
      return;
809
802
    }
 
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
 
810
833
  }
811
834
}
812
835
 
827
850
  "sup_binlog_formats", ["mixed","statement"]],
828
851
 ["include/have_binlog_format_row_or_statement.inc",
829
852
  "sup_binlog_formats", ["row","statement"]],
 
853
 ["include/big_test.inc", "big_test", 1],
830
854
 ["include/have_debug.inc", "need_debug", 1],
831
855
 ["require_manager", "require_manager", 1],
832
856
);