#At lp:maria 2796 knielsen@knielsen-hq.org 2009-11-05 MBug#471160: Fix testsuite to work when run from installed packages. Some files are in different locations in this case. modified: mysql-test/lib/mtr_cases.pm mysql-test/mysql-test-run.pl === modified file 'mysql-test/lib/mtr_cases.pm' --- a/mysql-test/lib/mtr_cases.pm 2009-10-07 22:59:07 +0000 +++ b/mysql-test/lib/mtr_cases.pm 2009-11-05 13:37:47 +0000 @@ -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" ], === modified file 'mysql-test/mysql-test-run.pl' --- a/mysql-test/mysql-test-run.pl 2009-10-07 22:57:43 +0000 +++ b/mysql-test/mysql-test-run.pl 2009-11-05 13:37:47 +0000 @@ -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)