Commit 060c768c authored by unknown's avatar unknown
Browse files

Bug#24274 option "--big-test" of mysql-test-run.pl does not work anymore 

 - Set environment variable BIG_TEST when using --big-test
 - Skip comment lines when looking for features a test case supports.


mysql-test/lib/mtr_cases.pl:
  Skip all lines that start with # when looking for features required by the test case
mysql-test/mysql-test-run.pl:
  Set environment variable BIG_TEST if option --big-test passed.
parent f142723e

mysql-test/lib/mtr_cases.pl

+3 −0
Original line number Diff line number Diff line
@@ -593,6 +593,9 @@ sub mtr_options_from_test_file($$) { 


  while ( my $line= <$F> )

  {

    # Skip line if it start's with #

    next if ( $line =~ /^#/ );



    # Match this line against tag in "tags" array

    foreach my $tag (@tags)

    {

mysql-test/mysql-test-run.pl

+11 −9
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ our $exe_libtool; 


our $opt_bench= 0;

our $opt_small_bench= 0;

our $opt_big_test= 0;            # Send --big-test to mysqltest

our $opt_big_test= 0;



our @opt_extra_mysqld_opt;
@@ -919,6 +919,14 @@ sub command_line_setup () { 
    $opt_sleep_time_after_restart= $opt_sleep;

  }



  # --------------------------------------------------------------------------

  # Big test flags

  # --------------------------------------------------------------------------

  if ( $opt_big_test )

  {

    $ENV{'BIG_TEST'}= 1;

  }



  # --------------------------------------------------------------------------

  # Gcov flag

  # --------------------------------------------------------------------------
@@ -4370,11 +4378,6 @@ sub run_mysqltest ($) { 
    mtr_add_arg($args, "--timer-file=%s/log/timer", $opt_vardir);

  }



  if ( $opt_big_test )

  {

    mtr_add_arg($args, "--big-test");

  }



  if ( $opt_compress )

  {

    mtr_add_arg($args, "--compress");
@@ -4765,9 +4768,8 @@ Options to control what test suites or cases to run 
  skip-rpl              Skip the replication test cases.

  skip-im               Don't start IM, and skip the IM test cases

  skip-test=PREFIX      Skip test cases which name are prefixed with PREFIX

  big-test              Pass "--big-test" to mysqltest which will set the

                        environment variable BIG_TEST, which can be checked

                        from test cases.

  big-test              Set the environment variable BIG_TEST, which can be

                        checked from test cases.



Options that specify ports