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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
34cfceac
Commit
34cfceac
authored
Feb 05, 2013
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
13625278 5.1=> 5.5
parents
322edf6b
96e61d66
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
1 deletion
+17
-1
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+17
-1
No files found.
mysql-test/mysql-test-run.pl
View file @
34cfceac
...
@@ -3994,6 +3994,7 @@ sub run_testcase ($) {
...
@@ -3994,6 +3994,7 @@ sub run_testcase ($) {
my
$test
=
start_mysqltest
(
$tinfo
);
my
$test
=
start_mysqltest
(
$tinfo
);
# Set only when we have to keep waiting after expectedly died server
# Set only when we have to keep waiting after expectedly died server
my
$keep_waiting_proc
=
0
;
my
$keep_waiting_proc
=
0
;
my
$print_timeout
=
start_timer
(
$print_freq
*
60
);
while
(
1
)
while
(
1
)
{
{
...
@@ -4018,7 +4019,22 @@ sub run_testcase ($) {
...
@@ -4018,7 +4019,22 @@ sub run_testcase ($) {
}
}
if
(
!
$keep_waiting_proc
)
if
(
!
$keep_waiting_proc
)
{
{
$proc
=
My::
SafeProcess
->
wait_any_timeout
(
$test_timeout
);
if
(
$test_timeout
>
$print_timeout
)
{
$proc
=
My::
SafeProcess
->
wait_any_timeout
(
$print_timeout
);
if
(
$proc
->
{
timeout
}
)
{
#print out that the test is still on
mtr_print
("
Test still running:
$tinfo
->{name}
");
#reset the timer
$print_timeout
=
start_timer
(
$print_freq
*
60
);
next
;
}
}
else
{
$proc
=
My::
SafeProcess
->
wait_any_timeout
(
$test_timeout
);
}
}
}
# Will be restored if we need to keep waiting
# Will be restored if we need to keep waiting
...
...
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