Skip to content

Commit 3b80d23

Browse files
abarkovvuvova
authored andcommitted
mtr --skip-not-found did not skip suites
--skip-not-found switch tells mtr to skip not found tests instead of aborting. But it failed to skip the test if the suite name was not found. This problem also made the *last-N-failed builbot builders fail to run `mtr --skip-not-found` if the last commit removed a file in the mysql-test/include/ directory. This commit fixes it, now the not found test is properly skipped, no matter what component of the test name was not found: $ ./mtr main.foo --skip-not-found foo.main ... ============================================================================== TEST WORKER RESULT TIME (ms) or COMMENT -------------------------------------------------------------------------- foo.main [ skipped ] not found main.foo [ skipped ] not found --------------------------------------------------------------------------
1 parent a2bd936 commit 3b80d23

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

mysql-test/lib/mtr_cases.pm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,8 @@ sub collect_suite_name($$)
398398
{
399399
my @dirs = my_find_dir(dirname($::glob_mysql_test_dir),
400400
["mysql-test/suite", @plugin_suitedirs ],
401-
$suitename);
401+
$suitename,
402+
$::opt_skip_not_found ? NOT_REQUIRED : undef);
402403
#
403404
# if $suitename contained wildcards, we'll have many suites and
404405
# their overlays here. Let's group them appropriately.

0 commit comments

Comments
 (0)