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
182d37fa
Commit
182d37fa
authored
18 years ago
by
msvensson@shellback.(none)
Browse files
Options
Browse Files
Download
Plain Diff
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
parents
25449f67
61529f6a
Branches unavailable
Tags unavailable
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
58 additions
and
22 deletions
+58
-22
mysql-test/lib/mtr_gcov.pl
mysql-test/lib/mtr_gcov.pl
+17
-1
mysql-test/lib/mtr_report.pl
mysql-test/lib/mtr_report.pl
+25
-1
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+16
-20
No files found.
mysql-test/lib/mtr_gcov.pl
View file @
182d37fa
...
...
@@ -23,12 +23,28 @@ sub gcov_prepare () {
-or -name
\
*.da | xargs rm
`;
}
# Used by gcov
our
@mysqld_src_dirs
=
(
"
strings
",
"
mysys
",
"
include
",
"
extra
",
"
regex
",
"
isam
",
"
merge
",
"
myisam
",
"
myisammrg
",
"
heap
",
"
sql
",
);
sub
gcov_collect
()
{
print
"
Collecting source coverage info...
\n
";
-
f
$::opt_gcov_msg
and
unlink
(
$::opt_gcov_msg
);
-
f
$::opt_gcov_err
and
unlink
(
$::opt_gcov_err
);
foreach
my
$d
(
@
::
mysqld_src_dirs
)
foreach
my
$d
(
@mysqld_src_dirs
)
{
chdir
("
$::glob_basedir/
$d
");
foreach
my
$f
(
(
glob
("
*.h
"),
glob
("
*.cc
"),
glob
("
*.c
"))
)
...
...
This diff is collapsed.
Click to expand it.
mysql-test/lib/mtr_report.pl
View file @
182d37fa
...
...
@@ -172,7 +172,7 @@ sub mtr_report_stats ($) {
my
$tot_failed
=
0
;
my
$tot_tests
=
0
;
my
$tot_restarts
=
0
;
my
$found_problems
=
0
;
# Some warning
s are errors...
my
$found_problems
=
0
;
# Some warnings in the logfile
s are errors...
foreach
my
$tinfo
(
@$tests
)
{
...
...
@@ -283,6 +283,7 @@ sub mtr_report_stats ($) {
print
"
\n
";
# Print a list of testcases that failed
if
(
$tot_failed
!=
0
)
{
my
$test_mode
=
join
("
",
@::glob_test_mode
)
||
"
default
";
...
...
@@ -296,7 +297,30 @@ sub mtr_report_stats ($) {
}
}
print
"
\n
";
}
# Print a list of check_testcases that failed(if any)
if
(
$::opt_check_testcases
)
{
my
@check_testcases
=
();
foreach
my
$tinfo
(
@$tests
)
{
if
(
defined
$tinfo
->
{'
check_testcase_failed
'}
)
{
push
(
@check_testcases
,
$tinfo
->
{'
name
'});
}
}
if
(
@check_testcases
)
{
print
"
Check of testcase failed for:
";
print
join
("
",
@check_testcases
);
print
"
\n\n
";
}
}
if
(
$tot_failed
!=
0
||
$found_problems
)
{
mtr_error
("
there where failing test cases
");
...
...
This diff is collapsed.
Click to expand it.
mysql-test/mysql-test-run.pl
View file @
182d37fa
...
...
@@ -87,22 +87,6 @@ require "lib/mtr_stress.pl";
$
Devel::Trace::
TRACE
=
1
;
# Used by gcov
our
@mysqld_src_dirs
=
(
"
strings
",
"
mysys
",
"
include
",
"
extra
",
"
regex
",
"
isam
",
"
merge
",
"
myisam
",
"
myisammrg
",
"
heap
",
"
sql
",
);
##############################################################################
#
# Default settings
...
...
@@ -503,9 +487,6 @@ sub initial_setup () {
"
$glob_basedir
/sql/release/mysqld
",
"
$glob_basedir
/sql/debug/mysqld
");
$exe_master_mysqld
=
$exe_master_mysqld
||
$exe_mysqld
;
$exe_slave_mysqld
=
$exe_slave_mysqld
||
$exe_mysqld
;
# Use the mysqld found above to find out what features are available
collect_mysqld_features
();
...
...
@@ -938,6 +919,12 @@ sub command_line_setup () {
}
}
# --------------------------------------------------------------------------
# Check if special exe was selected for master or slave
# --------------------------------------------------------------------------
$exe_master_mysqld
=
$exe_master_mysqld
||
$exe_mysqld
;
$exe_slave_mysqld
=
$exe_slave_mysqld
||
$exe_mysqld
;
# --------------------------------------------------------------------------
# Check valgrind arguments
# --------------------------------------------------------------------------
...
...
@@ -3945,6 +3932,10 @@ sub run_testcase_start_servers($) {
# Before a testcase, run in record mode, save result file to var
# After testcase, run and compare with the recorded file, they should be equal!
#
# RETURN VALUE
# 0 OK
# 1 Check failed
#
sub
run_check_testcase
($$)
{
my
$mode
=
shift
;
...
...
@@ -3989,6 +3980,7 @@ sub run_check_testcase ($$) {
{
mtr_error
("
Could not execute 'check-testcase'
$mode
testcase
");
}
return
$res
;
}
...
...
@@ -4178,7 +4170,11 @@ sub run_mysqltest ($) {
{
if
(
$mysqld
->
{'
pid
'})
{
run_check_testcase
("
after
",
$mysqld
);
if
(
run_check_testcase
("
after
",
$mysqld
))
{
# Check failed, mark the test case with that info
$tinfo
->
{'
check_testcase_failed
'}
=
1
;
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
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