Commit b7967587 authored by Magnus Svensson's avatar Magnus Svensson
Browse files

WL#4189 Set parallel to 1 if running under vmware on windows

parent f0ed343b

mysql-test/lib/My/SysInfo.pm

+15 −0
Original line number Diff line number Diff line
@@ -126,6 +126,15 @@ sub new { 
     \&_unamex,

   );



  # Detect virtual machines

  my $isvm= 0;



  if (IS_WINDOWS) {

    # Detect vmware service

    $isvm= `tasklist` =~ /vmwareservice/i;

  }

  $self->{isvm}= $isvm;



  foreach my $method (@info_methods){

    if ($method->($self)){

      return $self;
@@ -174,6 +183,12 @@ sub min_bogomips { 
  return $bogomips;

}



sub isvm {

  my ($self)= @_;



  return $self->{isvm};

}





# Prit the cpuinfo

sub print_info {

mysql-test/mysql-test-run.pl

+1 −0
Original line number Diff line number Diff line
@@ -279,6 +279,7 @@ sub main { 
    }

    $opt_parallel= 8 if ($opt_parallel > 8);

    $opt_parallel= $num_tests if ($opt_parallel > $num_tests);

    $opt_parallel= 1 if (IS_WINDOWS and $sys_info->isvm());

    $opt_parallel= 1 if ($opt_parallel < 1);

    mtr_report("Using parallel: $opt_parallel");

  }