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
92ac0e73
Commit
92ac0e73
authored
Nov 28, 2006
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Create new function "run_testcase_mark_logs' and use it to mark start of testcase
in all cuurently known log files
parent
a60fe75f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
28 additions
and
19 deletions
+28
-19
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+28
-19
No files found.
mysql-test/mysql-test-run.pl
View file @
92ac0e73
...
...
@@ -2952,26 +2952,15 @@ sub do_before_run_mysqltest($)
unlink
("
$result_dir
/
$tname
.log
");
unlink
("
$result_dir
/
$tname
.warnings
");
mtr_tonewfile
(
$path_current_test_log
,"
$tname
\n
");
# Always tell where we are
# output current test to ndbcluster log file to enable diagnostics
mtr_tofile
(
$path_ndb_testrun_log
,"
CURRENT TEST
$tname
\n
");
mtr_tofile
(
$master
->
[
0
]
->
{'
path_myerr
'},"
CURRENT_TEST:
$tname
\n
");
if
(
$master
->
[
1
]
->
{'
pid
'}
)
{
mtr_tofile
(
$master
->
[
1
]
->
{'
path_myerr
'},"
CURRENT_TEST:
$tname
\n
");
}
if
(
$mysql_version_id
<
50000
)
{
# Set envir
no
ment variable NDB_STATUS_OK to 1
# Set envir
on
ment variable NDB_STATUS_OK to 1
# if script decided to run mysqltest cluster _is_ installed ok
$ENV
{'
NDB_STATUS_OK
'}
=
"
1
";
}
elsif
(
$mysql_version_id
<
50100
)
{
# Set envir
no
ment variable NDB_STATUS_OK to YES
# Set envir
on
ment variable NDB_STATUS_OK to YES
# if script decided to run mysqltest cluster _is_ installed ok
$ENV
{'
NDB_STATUS_OK
'}
=
"
YES
";
}
...
...
@@ -2982,9 +2971,9 @@ sub do_after_run_mysqltest($)
my
$tinfo
=
shift
;
my
$tname
=
$tinfo
->
{'
name
'};
mtr_tofile
(
$path_mysqltest_log
,"
CURRENT TEST
$tname
\n
");
# Save info from this testcase run to mysqltest.log
mtr_appendfile_to_file
(
$path_current_test_log
,
$path_mysqltest_log
)
if
-
f
$path_current_test_log
;
mtr_appendfile_to_file
(
$path_timefile
,
$path_mysqltest_log
)
if
-
f
$path_timefile
;
...
...
@@ -2994,6 +2983,26 @@ sub do_after_run_mysqltest($)
}
sub
run_testcase_mark_logs
($)
{
my
(
$log_msg
)
=
@_
;
# Write a marker to all log files
# The file indicating current test name
mtr_tonewfile
(
$path_current_test_log
,
$log_msg
);
# each mysqld's .err file
foreach
my
$mysqld
(
@
{
$master
},
@
{
$slave
})
{
mtr_tofile
(
$mysqld
->
{
path_myerr
},
$log_msg
);
}
# ndbcluster log file
mtr_tofile
(
$path_ndb_testrun_log
,
$log_msg
);
}
sub
find_testcase_skipped_reason
($)
{
my
(
$tinfo
)
=
@_
;
...
...
@@ -3113,6 +3122,10 @@ sub run_testcase ($) {
run_testcase_stop_servers
(
$tinfo
,
$master_restart
,
$slave_restart
);
}
# Write to all log files to indicate start of testcase
run_testcase_mark_logs
("
CURRENT_TEST:
$tinfo
->{name}
\n
");
my
$died
=
mtr_record_dead_children
();
if
(
$died
or
$master_restart
or
$slave_restart
)
{
...
...
@@ -4124,8 +4137,6 @@ sub run_testcase_start_servers($) {
return
1
;
}
}
mtr_tofile
(
$master
->
[
1
]
->
{'
path_myerr
'},"
CURRENT_TEST:
$tname
\n
");
mysqld_start
(
$master
->
[
1
],
$tinfo
->
{'
master_opt
'},
[]
);
}
...
...
@@ -4153,8 +4164,6 @@ sub run_testcase_start_servers($) {
# ----------------------------------------------------------------------
if
(
$tinfo
->
{'
slave_num
'}
)
{
mtr_tofile
(
$slave
->
[
0
]
->
{'
path_myerr
'},"
CURRENT_TEST:
$tname
\n
");
restore_slave_databases
(
$tinfo
->
{'
slave_num
'});
do_before_start_slave
(
$tinfo
);
...
...
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