database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Bug#34761 Mysql-test-run.pl script hangs on Windows

Browse Source
This commit is contained in:
msvensson@pilot.mysql.com
2008-03-25 16:27:23 +01:00
parent e1a6f3c243
commit 06c73d7d1c
1 changed files with 19 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
mysql-test/mysql-test-run.pl
View File

@@ -62,6 +62,7 @@ use File::Path;
use File::Basename; use File::Basename;
use File::Copy; use File::Copy;
use File::Temp qw /tempdir/; use File::Temp qw /tempdir/;
use File::Spec::Functions qw /splitdir/;
use Cwd; use Cwd;
use Getopt::Long; use Getopt::Long;
use IO::Socket; use IO::Socket;
@@ -134,17 +135,6 @@ our $default_vardir;
our $opt_usage; our $opt_usage;
our $opt_suites; our $opt_suites;
our $opt_suites_default= "main,binlog,rpl,rpl_ndb,ndb"; # Default suites to run our $opt_suites_default= "main,binlog,rpl,rpl_ndb,ndb"; # Default suites to run
our @extra_suites=
(
["mysql-5.1-new-ndb", "ndb_team"],
["mysql-5.1-new-ndb-merge", "ndb_team"],
["mysql-5.1-telco-6.2", "ndb_team"],
["mysql-5.1-telco-6.2-merge", "ndb_team"],
["mysql-5.1-telco-6.3", "ndb_team"],
["mysql-6.0-ndb", "ndb_team"],
);
our $opt_script_debug= 0; # Script debugging, enable with --script-debug our $opt_script_debug= 0; # Script debugging, enable with --script-debug
our $opt_verbose= 0; # Verbose output, enable with --verbose our $opt_verbose= 0; # Verbose output, enable with --verbose
@@ -414,22 +404,27 @@ sub main () {
# Figure out which tests we are going to run # Figure out which tests we are going to run
if (!$opt_suites) if (!$opt_suites)
{ {
# use default and add any extra_suites as defined
$opt_suites= $opt_suites_default; $opt_suites= $opt_suites_default;
my $ccc= dirname($glob_mysql_test_dir);
my $found= 1; # BUG#34761 - disable this feature # Check for any extra suites to enable based on the path name
while (!$found and !($ccc eq "/") and !($ccc eq "")) my %extra_suites=
(
"mysql-5.1-new-ndb" => "ndb_team",
"mysql-5.1-new-ndb-merge" => "ndb_team",
"mysql-5.1-telco-6.2" => "ndb_team",
"mysql-5.1-telco-6.2-merge" => "ndb_team",
"mysql-5.1-telco-6.3" => "ndb_team",
"mysql-6.0-ndb" => "ndb_team",
);
foreach my $dir ( reverse splitdir($glob_basedir) )
{ {
my $ddd= basename($ccc); my $extra_suite= $extra_suites{$dir};
foreach my $extra_suite (@extra_suites) if (defined $extra_suite){
{ mtr_report("Found extra suite: $extra_suite");
if ($extra_suite->[0] eq "$ddd") $opt_suites= "$extra_suite,$opt_suites";
{ last;
$opt_suites= "$extra_suite->[1],$opt_suites";
$found= 1;
}
} }
$ccc= dirname($ccc);
} }
} }