Commit 06c73d7d authored by msvensson@pilot.mysql.com's avatar msvensson@pilot.mysql.com
Browse files

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

parent e1a6f3c2

mysql-test/mysql-test-run.pl

+19 −24
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ use File::Path; 
use File::Basename;

use File::Copy;

use File::Temp qw /tempdir/;

use File::Spec::Functions qw /splitdir/;

use Cwd;

use Getopt::Long;

use IO::Socket;
@@ -134,17 +135,6 @@ our $default_vardir; 
our $opt_usage;

our $opt_suites;

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_verbose= 0;  # Verbose output, enable with --verbose
@@ -414,22 +404,27 @@ sub main () { 
    # Figure out which tests we are going to run

    if (!$opt_suites)

    {

      # use default and add any extra_suites as defined

      $opt_suites= $opt_suites_default;

      my $ccc= dirname($glob_mysql_test_dir);

      my $found= 1; # BUG#34761 - disable this feature

      while (!$found and !($ccc eq "/") and !($ccc eq ""))

      {

	my $ddd= basename($ccc);

	foreach my $extra_suite (@extra_suites)

	{

	  if ($extra_suite->[0] eq "$ddd")



      # Check for any extra suites to enable based on the path name

      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) )

      {

	    $opt_suites= "$extra_suite->[1],$opt_suites";

	    $found= 1;

	  }

	my $extra_suite= $extra_suites{$dir};

	if (defined $extra_suite){

	  mtr_report("Found extra suite: $extra_suite");

	  $opt_suites= "$extra_suite,$opt_suites";

	  last;

	}

	$ccc= dirname($ccc);

      }

    }