diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-01-25 11:34:43 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-01-25 11:34:43 +0100 |
| commit | 8fedf8ac75dc64eea281df27baa064c00078580a (patch) | |
| tree | 8b9db35b9312441a8cfffe3ff93150b9e80531ce | |
| parent | ac3c60d5528f3abdd3a1eb9fade6c05c984fe844 (diff) | |
| download | mariadb-git-8fedf8ac75dc64eea281df27baa064c00078580a.tar.gz | |
mtr runs only "big" tests, if --big-test is repeated twice
| -rw-r--r-- | mysql-test/lib/mtr_cases.pm | 7 | ||||
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm index 727e56ac77a..8b87ad367e3 100644 --- a/mysql-test/lib/mtr_cases.pm +++ b/mysql-test/lib/mtr_cases.pm @@ -925,6 +925,13 @@ sub collect_one_test_case { return $tinfo } + if ( ! $tinfo->{'big_test'} and $::opt_big_test > 1 ) + { + $tinfo->{'skip'}= 1; + $tinfo->{'comment'}= "Small test"; + return $tinfo + } + if ( $tinfo->{'need_debug'} && ! $::debug_compiled_binaries ) { $tinfo->{'skip'}= 1; diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index b2c7ee2fc37..cb6f7b4a486 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -986,7 +986,7 @@ sub command_line_setup { 'skip-test=s' => \&collect_option, 'do-test=s' => \&collect_option, 'start-from=s' => \&collect_option, - 'big-test' => \$opt_big_test, + 'big-test+' => \$opt_big_test, 'combination=s' => \@opt_combinations, 'skip-combinations' => \&collect_option, 'experimental=s' => \@opt_experimentals, @@ -5984,7 +5984,8 @@ Options to control what test suites or cases to run list of suite names. The default is: "$DEFAULT_SUITES" skip-rpl Skip the replication test cases. - big-test Also run tests marked as "big" + big-test Also run tests marked as "big". Repeat this option + twice to run only "big" tests. staging-run Run a limited number of tests (no slow tests). Used for running staging trees with valgrind. enable-disabled Run also tests marked as disabled |