Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
770ef5c3
Commit
770ef5c3
authored
Oct 11, 2008
by
Magnus Svensson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
WL#4189 Set parallel to 1 if running under vmware on windows
parent
6a107188
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
0 deletions
+16
-0
mysql-test/lib/My/SysInfo.pm
mysql-test/lib/My/SysInfo.pm
+15
-0
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+1
-0
No files found.
mysql-test/lib/My/SysInfo.pm
View file @
770ef5c3
...
@@ -126,6 +126,15 @@ sub new {
...
@@ -126,6 +126,15 @@ sub new {
\&
_unamex
,
\&
_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
){
foreach
my
$method
(
@info_methods
){
if
(
$method
->
(
$self
)){
if
(
$method
->
(
$self
)){
return
$self
;
return
$self
;
...
@@ -174,6 +183,12 @@ sub min_bogomips {
...
@@ -174,6 +183,12 @@ sub min_bogomips {
return
$bogomips
;
return
$bogomips
;
}
}
sub
isvm
{
my
(
$self
)
=
@_
;
return
$self
->
{
isvm
};
}
# Prit the cpuinfo
# Prit the cpuinfo
sub
print_info
{
sub
print_info
{
...
...
mysql-test/mysql-test-run.pl
View file @
770ef5c3
...
@@ -279,6 +279,7 @@ sub main {
...
@@ -279,6 +279,7 @@ sub main {
}
}
$opt_parallel
=
8
if
(
$opt_parallel
>
8
);
$opt_parallel
=
8
if
(
$opt_parallel
>
8
);
$opt_parallel
=
$num_tests
if
(
$opt_parallel
>
$num_tests
);
$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
);
$opt_parallel
=
1
if
(
$opt_parallel
<
1
);
mtr_report
("
Using parallel:
$opt_parallel
");
mtr_report
("
Using parallel:
$opt_parallel
");
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment