From 3dcbe769fbc54b90e41888c79e6e43125a8f04d3 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 5 Nov 2009 14:40:01 +0100 Subject: [PATCH] Fix running test suite from installed package. Some files are in different locations in this case. --- mysql-test/lib/mtr_cases.pm | 4 ++++ mysql-test/mysql-test-run.pl | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm index 046887c4428..6cdae0d74d8 100644 --- a/mysql-test/lib/mtr_cases.pm +++ b/mysql-test/lib/mtr_cases.pm @@ -249,6 +249,10 @@ sub collect_one_suite($) $suitedir= my_find_dir($::basedir, ["mysql-test/suite", "mysql-test", + "share/mysql-test/suite", + "share/mysql-test", + "share/mysql/mysql-test/suite", + "share/mysql/mysql-test", # Look in storage engine specific suite dirs "storage/*/mysql-test-suites" ], diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 72e49ed01f8..0b849a4ff5a 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1001,6 +1001,12 @@ sub command_line_setup { { $basedir= dirname($basedir); } + # For .deb, it's like RPM, but installed in /usr/share/mysql/mysql-test. + # So move up one more directory level yet. + if ( ! $source_dist and ! -d "$basedir/bin" ) + { + $basedir= dirname($basedir); + } # Look for the client binaries directory if ($path_client_bindir)