From 3674c72d20f12a2d67a0f9a6e03b6890d75403e6 Mon Sep 17 00:00:00 2001
From: unknown <msvensson@pilot.mysql.com>
Date: Tue, 22 Apr 2008 12:40:48 +0200
Subject: [PATCH] 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:
  Extend 'my_find_paths' to glob path names
---
 mysql-test/lib/My/Find.pm   |  6 ++++++
 mysql-test/lib/mtr_cases.pm | 18 ++++++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/mysql-test/lib/My/Find.pm b/mysql-test/lib/My/Find.pm
index b8906dee1ca..1b1b5645dc9 100644
--- a/mysql-test/lib/My/Find.pm
+++ b/mysql-test/lib/My/Find.pm
@@ -168,6 +168,12 @@ sub my_find_paths {
   @paths= map { "$base/$_" } @paths;
   #print "paths: @paths\n";
 
+  # -------------------------------------------------------
+  # Glob all paths to expand wildcards
+  # -------------------------------------------------------
+  @paths= map { glob("$_") } @paths;
+  #print "paths: @paths\n";
+
   # -------------------------------------------------------
   # Return the list of paths
   # -------------------------------------------------------
diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm
index 52eb84118b7..0f8329f2f31 100644
--- a/mysql-test/lib/mtr_cases.pm
+++ b/mysql-test/lib/mtr_cases.pm
@@ -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";