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
b4d4e7a3
Commit
b4d4e7a3
authored
Sep 14, 2005
by
joerg@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve error / process handling in the Perl script to run the test suite (patch supplied by Kent).
parent
eee616d1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
5 deletions
+11
-5
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
+6
-0
No files found.
mysql-test/lib/mtr_process.pl
View file @
b4d4e7a3
...
...
@@ -166,7 +166,7 @@ sub spawn_impl ($$$$$$$$) {
{
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 ($$$$$$$$) {
{
if
(
!
open
(
STDERR
,"
>&STDOUT
")
)
{
mtr_error
("
can't dup STDOUT: $!
");
mtr_
child_
error
("
can't dup STDOUT: $!
");
}
}
else
{
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 ($$$$$$$$) {
{
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
)
)
{
mtr_error
("
failed to execute
\"
$path
\"
: $!
");
mtr_
child_
error
("
failed to execute
\"
$path
\"
: $!
");
}
}
}
...
...
mysql-test/lib/mtr_report.pl
View file @
b4d4e7a3
...
...
@@ -19,6 +19,7 @@ sub mtr_print_header ();
sub
mtr_report
(@);
sub
mtr_warning
(@);
sub
mtr_error
(@);
sub
mtr_child_error
(@);
sub
mtr_debug
(@);
...
...
@@ -286,6 +287,11 @@ sub mtr_error (@) {
mtr_exit
(
1
);
}
sub
mtr_child_error
(@)
{
print
STDERR
"
mysql-test-run: *** ERROR(child):
",
join
("
",
@_
),"
\n
";
exit
(
1
);
}
sub
mtr_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