Skip to content

Commit

Permalink
Add option to skip big tests
Browse files Browse the repository at this point in the history
Summary:
Our tests are timing out because we're running big tests even when we did not ask for them.

This is because as of mysql/mysql-server@f0bcecb315a2, mtr will now turn on disabled and big tests even if the user did not ask for them. Add an option to override this behaviour.

Test Plan: mysqltest.sh --testset=Serial locally with tools change

Reviewers: abhinavsharma, herman

Reviewed By: herman

Subscribers: butterflybot, vinaybhat, webscalesql-eng@fb.com

Differential Revision: https://phabricator.intern.facebook.com/D14115272

Tags: mysql80

Signature: 14115272:1550701852:354be953d1981a176a75cb1bf2d2bf57844e85bf
  • Loading branch information
lth committed Feb 20, 2019
1 parent d334c3a commit a4386be
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions mysql-test/mysql-test-run.pl
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@
our $opt_xml_report;

our $opt_big_test = 0;
our $opt_skip_big_test = 0;
our $opt_check_testcases = 1;
our $opt_clean_vardir = $ENV{'MTR_CLEAN_VARDIR'};
our $opt_ctest = env_or_val(MTR_UNIT_TESTS => -1);
Expand Down Expand Up @@ -1361,6 +1362,7 @@ sub command_line_setup {

# Control what test suites or cases to run
'big-test' => \$opt_big_test,
'skip-big-test' => \$opt_skip_big_test,
'combination=s' => \@opt_combinations,
'do-suite=s' => \$opt_do_suite,
'do-test=s' => \&collect_option,
Expand Down Expand Up @@ -1810,6 +1812,11 @@ sub command_line_setup {
$opt_big_test = 1 if !$opt_big_test;
}

if ($opt_skip_big_test) {
$opt_big_test = 0;
$opt_only_big_test = 0;
}

$ENV{'BIG_TEST'} = 1 if ($opt_big_test or $opt_only_big_test);

# Gcov flag
Expand Down

0 comments on commit a4386be

Please sign in to comment.