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
734895c7
Commit
734895c7
authored
Sep 14, 2005
by
joerg@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/M50/upward-5.0 into mysql.com:/M51/merge-5.1
parents
5cc8f58c
3d457c3b
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
8 deletions
+14
-8
mysql-test/lib/mtr_process.pl
mysql-test/lib/mtr_process.pl
+5
-5
mysql-test/lib/mtr_report.pl
mysql-test/lib/mtr_report.pl
+9
-3
No files found.
mysql-test/lib/mtr_process.pl
View file @
734895c7
...
@@ -166,7 +166,7 @@ sub spawn_impl ($$$$$$$$) {
...
@@ -166,7 +166,7 @@ sub spawn_impl ($$$$$$$$) {
{
{
if
(
!
open
(
STDOUT
,
$log_file_open_mode
,
$output
)
)
if
(
!
open
(
STDOUT
,
$log_file_open_mode
,
$output
)
)
{
{
mtr_error
("
can't redirect STDOUT to
\"
$output
\"
: $!
");
mtr_
child_
error
("
can't redirect STDOUT to
\"
$output
\"
: $!
");
}
}
}
}
...
@@ -176,14 +176,14 @@ sub spawn_impl ($$$$$$$$) {
...
@@ -176,14 +176,14 @@ sub spawn_impl ($$$$$$$$) {
{
{
if
(
!
open
(
STDERR
,"
>&STDOUT
")
)
if
(
!
open
(
STDERR
,"
>&STDOUT
")
)
{
{
mtr_error
("
can't dup STDOUT: $!
");
mtr_
child_
error
("
can't dup STDOUT: $!
");
}
}
}
}
else
else
{
{
if
(
!
open
(
STDERR
,
$log_file_open_mode
,
$error
)
)
if
(
!
open
(
STDERR
,
$log_file_open_mode
,
$error
)
)
{
{
mtr_error
("
can't redirect STDERR to
\"
$error
\"
: $!
");
mtr_
child_
error
("
can't redirect STDERR to
\"
$error
\"
: $!
");
}
}
}
}
}
}
...
@@ -192,13 +192,13 @@ sub spawn_impl ($$$$$$$$) {
...
@@ -192,13 +192,13 @@ sub spawn_impl ($$$$$$$$) {
{
{
if
(
!
open
(
STDIN
,"
<
",
$input
)
)
if
(
!
open
(
STDIN
,"
<
",
$input
)
)
{
{
mtr_error
("
can't redirect STDIN to
\"
$input
\"
: $!
");
mtr_
child_
error
("
can't redirect STDIN to
\"
$input
\"
: $!
");
}
}
}
}
if
(
!
exec
(
$path
,
@$arg_list_t
)
)
if
(
!
exec
(
$path
,
@$arg_list_t
)
)
{
{
mtr_error
("
failed to execute
\"
$path
\"
: $!
");
mtr_
child_
error
("
failed to execute
\"
$path
\"
: $!
");
}
}
}
}
}
}
...
...
mysql-test/lib/mtr_report.pl
View file @
734895c7
...
@@ -19,6 +19,7 @@ sub mtr_print_header ();
...
@@ -19,6 +19,7 @@ sub mtr_print_header ();
sub
mtr_report
(@);
sub
mtr_report
(@);
sub
mtr_warning
(@);
sub
mtr_warning
(@);
sub
mtr_error
(@);
sub
mtr_error
(@);
sub
mtr_child_error
(@);
sub
mtr_debug
(@);
sub
mtr_debug
(@);
...
@@ -74,7 +75,7 @@ sub mtr_show_failed_diff ($) {
...
@@ -74,7 +75,7 @@ sub mtr_show_failed_diff ($) {
sub
mtr_report_test_name
($)
{
sub
mtr_report_test_name
($)
{
my
$tinfo
=
shift
;
my
$tinfo
=
shift
;
printf
"
%-3
1
s
",
$tinfo
->
{'
name
'};
printf
"
%-3
0
s
",
$tinfo
->
{'
name
'};
}
}
sub
mtr_report_test_skipped
($)
{
sub
mtr_report_test_skipped
($)
{
...
@@ -122,13 +123,13 @@ sub mtr_report_test_failed ($) {
...
@@ -122,13 +123,13 @@ sub mtr_report_test_failed ($) {
# we should write out into $::path_timefile when the error occurs.
# we should write out into $::path_timefile when the error occurs.
if
(
-
f
$::path_timefile
)
if
(
-
f
$::path_timefile
)
{
{
print
"
Errors are (from $::path_timefile) :
\n
";
print
"
\n
Errors are (from $::path_timefile) :
\n
";
print
mtr_fromfile
(
$::path_timefile
);
# FIXME print_file() instead
print
mtr_fromfile
(
$::path_timefile
);
# FIXME print_file() instead
print
"
\n
(the last lines may be the most important ones)
\n
";
print
"
\n
(the last lines may be the most important ones)
\n
";
}
}
else
else
{
{
print
"
Unexpected termination, probably when starting mysqld
\n
";
print
"
\n
Unexpected termination, probably when starting mysqld
\n
";
}
}
}
}
...
@@ -286,6 +287,11 @@ sub mtr_error (@) {
...
@@ -286,6 +287,11 @@ sub mtr_error (@) {
mtr_exit
(
1
);
mtr_exit
(
1
);
}
}
sub
mtr_child_error
(@)
{
print
STDERR
"
mysql-test-run: *** ERROR(child):
",
join
("
",
@_
),"
\n
";
exit
(
1
);
}
sub
mtr_debug
(@)
{
sub
mtr_debug
(@)
{
if
(
$::opt_script_debug
)
if
(
$::opt_script_debug
)
{
{
...
...
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