Allow start-from to also filter on suitename

2 files changed, 16 insertions, 6 deletions

diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm
index 16d4da39667..2a8a3054ed9 100644
--- a/mysql-test/lib/mtr_cases.pm
+++ b/mysql-test/lib/mtr_cases.pm
@@ -653,18 +653,26 @@ sub collect_one_test_case {
   #print " filename: $filename\n";
 
   # ----------------------------------------------------------------------
-  # Skip some tests silently
+  # Check --start-from
   # ----------------------------------------------------------------------
-  if ( $start_from and $tname lt $start_from )
+  if ( $start_from )
   {
-    return;
+    # start_from can be specified as [suite.].testname_prefix
+    my ($suite, $test, $ext)= split_testname($start_from);
+
+    if ( $suite and $suitename lt $suite){
+      return; # Skip silently
+    }
+    if ( $tname lt $test ){
+      return; # Skip silently
+    }
   }
 
   # ----------------------------------------------------------------------
   # Set defaults
   # ----------------------------------------------------------------------
   my $tinfo= {};
-  $tinfo->{'name'}= basename($suitename) . ".$tname";
+  $tinfo->{'name'}= $suitename . ".$tname";
   $tinfo->{'path'}= "$testdir/$filename";
 
   # TODO allow nonexistsing result file
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index b72fd085609..2d578e776f7 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -3588,8 +3588,10 @@ Options to control what test suites or cases to run
   skip-test=PREFIX or REGEX
                         Skip test cases which name are prefixed with PREFIX
                         or fulfills REGEX
-  start-from=PREFIX     Run test cases starting from test prefixed with PREFIX
-  suite[s]=NAME1,..,NAMEN Collect tests in suites from the comma separated
+  start-from=PREFIX     Run test cases starting test prefixed with PREFIX where
+                        prefix may be suite.testname or just testname
+  suite[s]=NAME1,..,NAMEN
+                        Collect tests in suites from the comma separated
                         list of suite names.
                         The default is: "$opt_suites"
   skip-rpl              Skip the replication test cases.