← 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: 2009-01-17 02:46:52 UTC
  • Revision ID: brian@gir-3.local-20090117024652-4ducefje08ajbs1q
Refactor append_identifier and remove dead OPTION_QUOTE_SHOW_CREATE option
(we always quote).

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'}}) . "~");
213
214
 
214
215
  mtr_verbose("Collecting: $suite");
215
216
 
216
 
  my $suitepath= "$::glob_suite_path";
217
217
  my $suitedir= "$::glob_mysql_test_dir"; # Default
218
218
  if ( $suite ne "main" )
219
219
  {
220
 
    $suitedir= mtr_path_exists(
221
 
             "$suitepath/$suite/drizzle-tests",
222
 
             "$suitepath/$suite/tests",
223
 
             "$suitedir/suite/$suite",
 
220
    $suitedir= mtr_path_exists("$suitedir/suite/$suite",
224
221
                               "$suitedir/$suite");
225
222
    mtr_verbose("suitedir: $suitedir");
226
223
  }
791
788
        if ( $::used_default_engine =~ /^innodb/i );
792
789
    }
793
790
 
 
791
    if ( $tinfo->{'big_test'} and ! $::opt_big_test )
 
792
    {
 
793
      $tinfo->{'skip'}= 1;
 
794
      $tinfo->{'comment'}= "Test need 'big-test' option";
 
795
      return;
 
796
    }
 
797
 
794
798
    if ( $tinfo->{'ndb_extra'} and ! $::opt_ndb_extra_test )
795
799
    {
796
800
      $tinfo->{'skip'}= 1;
811
815
      $tinfo->{'comment'}= "Test need debug binaries";
812
816
      return;
813
817
    }
 
818
 
 
819
    {
 
820
      if ( $::opt_with_ndbcluster_only )
 
821
      {
 
822
        # Only the ndb test should be run, all other should be skipped
 
823
        $tinfo->{'skip'}= 1;
 
824
        $tinfo->{'comment'}= "Only ndbcluster tests(--with-ndbcluster-only)";
 
825
        return;
 
826
      }
 
827
    }
 
828
 
 
829
    if ( $tinfo->{'need_binlog'} )
 
830
    {
 
831
      if (grep(/^--skip-log-bin/,  @::opt_extra_mysqld_opt) )
 
832
      {
 
833
        $tinfo->{'skip'}= 1;
 
834
        $tinfo->{'comment'}= "Test need binlog";
 
835
        return;
 
836
      }
 
837
    }
 
838
    else
 
839
    {
 
840
      if ( $::mysql_version_id >= 50100 )
 
841
      {
 
842
        # Test does not need binlog, add --skip-binlog to
 
843
        # the options used when starting it
 
844
        push(@{$tinfo->{'master_opt'}}, "--skip-log-bin");
 
845
      }
 
846
    }
 
847
 
814
848
  }
815
849
}
816
850
 
831
865
  "sup_binlog_formats", ["mixed","statement"]],
832
866
 ["include/have_binlog_format_row_or_statement.inc",
833
867
  "sup_binlog_formats", ["row","statement"]],
 
868
 ["include/big_test.inc", "big_test", 1],
834
869
 ["include/have_debug.inc", "need_debug", 1],
835
870
 ["require_manager", "require_manager", 1],
836
871
);