Skip to content

Commit

Permalink
./mtr --skip-not-found
Browse files Browse the repository at this point in the history
New mtr option --skip-not-found makes it to show not found tests
as skipped

main.a                                   [ skipped ]  not found

(but only if the test was specified with the suite name)
and not error out early with

mysql-test-run: *** ERROR: Could not find 'a' in 'main' suite

This is useful in buildbot, on builders that generate the list
of tests dynamically.
  • Loading branch information
vuvova committed Oct 23, 2023
1 parent b00fd50 commit 78cd45b
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
12 changes: 11 additions & 1 deletion mysql-test/lib/mtr_cases.pm
Expand Up @@ -154,7 +154,17 @@ sub collect_test_cases ($$$$) {
{
push (@$cases, @this_case);
}
else
elsif ($::opt_skip_not_found)
{
push @$cases, My::Test->new
(
name => "$sname.$tname",
shortname => $tname,
skip => 1,
comment => 'not found',
);
}
else
{
mtr_error("Could not find '$tname' in '$sname' suite");
}
Expand Down
4 changes: 4 additions & 0 deletions mysql-test/mysql-test-run.pl
Expand Up @@ -259,6 +259,7 @@ END

our $opt_fast= 0;
our $opt_force= 0;
our $opt_skip_not_found= 0;
our $opt_mem= $ENV{'MTR_MEM'};
our $opt_clean_vardir= $ENV{'MTR_CLEAN_VARDIR'};

Expand Down Expand Up @@ -1158,6 +1159,7 @@ sub command_line_setup {

# Control what test suites or cases to run
'force+' => \$opt_force,
'skip-not-found' => \$opt_skip_not_found,
'suite|suites=s' => \$opt_suites,
'skip-rpl' => \&collect_option,
'skip-test=s' => \&collect_option,
Expand Down Expand Up @@ -5802,6 +5804,8 @@ ($)
the execution will continue from the next test file.
When specified twice, execution will continue executing
the failed test file from the next command.
skip-not-found It is not an error if a test was not found in a
specified test suite. Test will be marked as skipped.
do-test=PREFIX or REGEX
Run test cases which name are prefixed with PREFIX
or fulfills REGEX
Expand Down

0 comments on commit 78cd45b

Please sign in to comment.