bk commit into 5.1 tree (msvensson:1.2584)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson.  When msvensson does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-04-22 12:40:48+02:00, msvensson@stripped +2 -0
  Improve 'collect_one_suite' so it looks in storage/*/mysql-test-suites by default
  Also make it possible to specify a path to the suite, for example:
  ./mtr --suite=/some/path/to/suitedir 

  mysql-test/lib/My/Find.pm@stripped, 2008-04-22 12:40:45+02:00, msvensson@stripped +6 -0
    Extend 'my_find_paths' to glob path names

  mysql-test/lib/mtr_cases.pm@stripped, 2008-04-22 12:40:45+02:00, msvensson@stripped +14 -4
    Improve 'collect_one_suite' so it looks in storage/*/mysql-test-suites by default
    Also make it possible to specify a path to the suite, for example:
    ./mtr --suite=/some/path/to/suitedir 

diff -Nrup a/mysql-test/lib/My/Find.pm b/mysql-test/lib/My/Find.pm
--- a/mysql-test/lib/My/Find.pm	2008-03-13 17:16:40 +01:00
+++ b/mysql-test/lib/My/Find.pm	2008-04-22 12:40:45 +02:00
@@ -169,6 +169,12 @@ sub my_find_paths {
   #print "paths: @paths\n";
 
   # -------------------------------------------------------
+  # Glob all paths to expand wildcards
+  # -------------------------------------------------------
+  @paths= map { glob("$_") } @paths;
+  #print "paths: @paths\n";
+
+  # -------------------------------------------------------
   # Return the list of paths
   # -------------------------------------------------------
   return @paths;
diff -Nrup a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm
--- a/mysql-test/lib/mtr_cases.pm	2008-04-08 16:50:36 +02:00
+++ b/mysql-test/lib/mtr_cases.pm	2008-04-22 12:40:45 +02:00
@@ -55,6 +55,7 @@ use File::Basename;
 use IO::File();
 use My::Config;
 use My::Platform;
+use My::Find;
 
 require "mtr_misc.pl";
 
@@ -248,11 +249,20 @@ sub collect_one_suite($)
   my $suitedir= "$::glob_mysql_test_dir"; # Default
   if ( $suite ne "main" )
   {
-    $suitedir= mtr_path_exists("$suitedir/suite/$suite",
-			       "$suitedir/$suite");
+    if ( -d $suite ){
+      $suitedir= $suite;
+    }
+    else
+    {
+      $suitedir= my_find_dir($::basedir,
+			     ["mysql-test/suite",
+			      "mysql-test",
+			      # Look in storage engine specific suite dirs
+			      "storage/*/mysql-test-suites"
+			     ],
+			     [$suite]);
+    }
     mtr_verbose("suitedir: $suitedir");
-
-
   }
 
   my $testdir= "$suitedir/t";