diff options
| author | Aleksey Midenkov <midenok@gmail.com> | 2019-06-13 12:13:08 +0300 |
|---|---|---|
| committer | Aleksey Midenkov <midenok@gmail.com> | 2019-06-14 11:02:24 +0300 |
| commit | 99c8c691b3d185e889a946f515c2cc324e57891f (patch) | |
| tree | 764ad16e0811927874c0013cc4807cd72bcf30f2 | |
| parent | a4abed997f1527167276e8930ea14aaa43dccb41 (diff) | |
| download | mariadb-git-10.4-midenok.tar.gz | |
mysql-test-run: imply --force when --max-test-fail is specified from command line10.4-midenok
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 9f841387c24..9ce47bbe7d2 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -356,7 +356,7 @@ my $source_dist= -d "../sql"; my $opt_max_save_core= env_or_val(MTR_MAX_SAVE_CORE => 5); my $opt_max_save_datadir= env_or_val(MTR_MAX_SAVE_DATADIR => 20); -my $opt_max_test_fail= env_or_val(MTR_MAX_TEST_FAIL => 10); +my $opt_max_test_fail= undef; my $opt_core_on_failure= 0; my $opt_parallel= $ENV{MTR_PARALLEL} || 1; @@ -1396,6 +1396,15 @@ sub command_line_setup { $opt_big_test= 1; } + if ( defined $opt_max_test_fail && !$opt_force ) + { + $opt_force= 1; + } + if ( not defined $opt_max_test_fail ) + { + $opt_max_test_fail= env_or_val(MTR_MAX_TEST_FAIL => 10); + } + # -------------------------------------------------------------------------- # Find out type of logging that are being used # -------------------------------------------------------------------------- @@ -6342,9 +6351,9 @@ Options for debugging the product $opt_max_save_datadir, set to 0 for no limit. Set it's default with MTR_MAX_SAVE_DATADIR max-test-fail Limit the number of test failures before aborting - the current test run. Defaults to - $opt_max_test_fail, set to 0 for no limit. Set - it's default with MTR_MAX_TEST_FAIL + the current test run. Command line option implies --force. + Defaults to $opt_max_test_fail, set to 0 for no limit. + Set it's default with MTR_MAX_TEST_FAIL core-in-failure Generate a core even if run server is run with valgrind Options for valgrind |