|
158 | 158 | my $opt_valgrind_clients = 0;
|
159 | 159 | my $opt_valgrind_mysqld = 0;
|
160 | 160 | my $opt_valgrind_mysqltest = 0;
|
| 161 | +my $opt_accept_fail = 0; |
161 | 162 |
|
162 | 163 | # Options used when connecting to an already running server
|
163 | 164 | my %opts_extern;
|
@@ -477,6 +478,11 @@ sub main {
|
477 | 478 | lock_order_prepare($bindir);
|
478 | 479 | }
|
479 | 480 |
|
| 481 | + if ($opt_accept_fail and not $opt_force) { |
| 482 | + $opt_force = 1; |
| 483 | + mtr_report("accept-test-fail turned on: enabling --force"); |
| 484 | + } |
| 485 | + |
480 | 486 | # Collect test cases from a file and put them into '@opt_cases'.
|
481 | 487 | if ($opt_do_test_list) {
|
482 | 488 | collect_test_cases_from_list(\@opt_cases, $opt_do_test_list, \$opt_ctest);
|
@@ -921,7 +927,7 @@ sub main {
|
921 | 927 |
|
922 | 928 | print_total_times($opt_parallel) if $opt_report_times;
|
923 | 929 |
|
924 |
| - mtr_report_stats("Completed", $completed); |
| 930 | + mtr_report_stats("Completed", $completed, $opt_accept_fail); |
925 | 931 |
|
926 | 932 | remove_vardir_subs() if $opt_clean_vardir;
|
927 | 933 |
|
@@ -1755,6 +1761,7 @@ sub command_line_setup {
|
1755 | 1761 | 'vardir=s' => \$opt_vardir,
|
1756 | 1762 |
|
1757 | 1763 | # Misc
|
| 1764 | + 'accept-test-fail' => \$opt_accept_fail, |
1758 | 1765 | 'charset-for-testdb=s' => \$opt_charset_for_testdb,
|
1759 | 1766 | 'colored-diff' => \$opt_colored_diff,
|
1760 | 1767 | 'comment=s' => \$opt_comment,
|
@@ -8032,6 +8039,9 @@ ($)
|
8032 | 8039 |
|
8033 | 8040 | Misc options
|
8034 | 8041 |
|
| 8042 | + accept-test-fail Do not print an error and do not give exit 1 if |
| 8043 | + some tests failed, but test run was completed. |
| 8044 | + This option also turns on --force. |
8035 | 8045 | charset-for-testdb CREATE DATABASE test CHARACTER SET <option value>.
|
8036 | 8046 | colored-diff Colorize the diff part of the output.
|
8037 | 8047 | comment=STR Write STR to the output.
|
|
0 commit comments