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
e9a33a53
Commit
e9a33a53
authored
May 19, 2020
by
Rasmus Johansson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-22631 some test causes MTR interruption without generating summary and XML
parent
44c8d849
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
3 deletions
+11
-3
mysql-test/lib/mtr_report.pm
mysql-test/lib/mtr_report.pm
+3
-1
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+8
-2
No files found.
mysql-test/lib/mtr_report.pm
View file @
e9a33a53
...
@@ -473,7 +473,7 @@ sub mtr_report_stats ($$$$) {
...
@@ -473,7 +473,7 @@ sub mtr_report_stats ($$$$) {
$comment
=~
s/[\"]//g
;
$comment
=~
s/[\"]//g
;
# if a test case has to be retried it should have the result MTR_RES_FAILED in jUnit XML
# if a test case has to be retried it should have the result MTR_RES_FAILED in jUnit XML
if
(
$test
->
{'
result
'}
eq
"
MTR_RES_FAILED
"
||
$test
->
{'
retries
'})
{
if
(
$test
->
{'
result
'}
eq
"
MTR_RES_FAILED
"
||
$test
->
{'
retries
'}
>
0
)
{
my
$logcontents
=
$test
->
{'
logfile-failed
'}
||
$test
->
{'
logfile
'};
my
$logcontents
=
$test
->
{'
logfile-failed
'}
||
$test
->
{'
logfile
'};
$xml_report
.=
qq(>\n\t\t\t<failure message="" type="MTR_RES_FAILED">\n<![CDATA[$logcontents]]>\n\t\t\t</failure>\n\t\t</testcase>\n)
;
$xml_report
.=
qq(>\n\t\t\t<failure message="" type="MTR_RES_FAILED">\n<![CDATA[$logcontents]]>\n\t\t\t</failure>\n\t\t</testcase>\n)
;
...
@@ -639,6 +639,8 @@ sub mtr_error (@) {
...
@@ -639,6 +639,8 @@ sub mtr_error (@) {
}
}
else
else
{
{
use
Carp
qw(cluck)
;
cluck
"
Error happened
"
if
$verbose
>
0
;
exit
(
1
);
exit
(
1
);
}
}
}
}
...
...
mysql-test/mysql-test-run.pl
View file @
e9a33a53
...
@@ -769,8 +769,14 @@ sub run_test_server ($$$) {
...
@@ -769,8 +769,14 @@ sub run_test_server ($$$) {
if
(
$result
->
is_failed
()
)
{
if
(
$result
->
is_failed
()
)
{
my
$worker_logdir
=
$result
->
{
savedir
};
my
$worker_logdir
=
$result
->
{
savedir
};
my
$log_file_name
=
dirname
(
$worker_logdir
)
.
"
/
"
.
$result
->
{
shortname
}
.
"
.log
";
my
$log_file_name
=
dirname
(
$worker_logdir
)
.
"
/
"
.
$result
->
{
shortname
}
.
"
.log
";
$result
->
{'
logfile-failed
'}
=
mtr_lastlinesfromfile
(
$log_file_name
,
20
);
rename
$log_file_name
,
$log_file_name
.
"
.failed
";
if
(
-
e
$log_file_name
)
{
$result
->
{'
logfile-failed
'}
=
mtr_lastlinesfromfile
(
$log_file_name
,
20
);
}
else
{
$result
->
{'
logfile-failed
'}
=
"";
}
rename
$log_file_name
,
$log_file_name
.
"
.failed
";
}
}
delete
(
$result
->
{
result
});
delete
(
$result
->
{
result
});
$result
->
{
retries
}
=
$retries
+
1
;
$result
->
{
retries
}
=
$retries
+
1
;
...
...
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