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
f1764fa9
Commit
f1764fa9
authored
Nov 10, 2006
by
df@kahlann.erinye.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add --report-features to mysql-test-run.pl
parent
f8931288
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
60 additions
and
3 deletions
+60
-3
mysql-test/include/report-features.test
mysql-test/include/report-features.test
+11
-0
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+49
-3
No files found.
mysql-test/include/report-features.test
0 → 100644
View file @
f1764fa9
#
# show server variables
#
--
disable_query_log
--
echo
=====
ENGINES
=====
show
engines
;
--
echo
=====
VARIABLES
=====
show
variables
;
--
echo
=====
STOP
=====
--
enable_query_log
mysql-test/mysql-test-run.pl
View file @
f1764fa9
...
@@ -182,6 +182,7 @@ our $opt_force;
...
@@ -182,6 +182,7 @@ our $opt_force;
our
$opt_reorder
=
0
;
our
$opt_reorder
=
0
;
our
$opt_enable_disabled
;
our
$opt_enable_disabled
;
our
$opt_mem
;
our
$opt_mem
;
our
$opt_report_features
;
our
$opt_gcov
;
our
$opt_gcov
;
our
$opt_gcov_err
;
our
$opt_gcov_err
;
...
@@ -423,10 +424,14 @@ sub main () {
...
@@ -423,10 +424,14 @@ sub main () {
if
(
!
$need_im
)
if
(
!
$need_im
)
{
{
$opt_skip_im
=
1
;
$opt_skip_im
=
1
;
}
}
initialize_servers
();
initialize_servers
();
if
(
$opt_report_features
)
{
run_report_features
();
}
run_suite
(
$opt_suite
,
$tests
);
run_suite
(
$opt_suite
,
$tests
);
}
}
...
@@ -670,6 +675,7 @@ sub command_line_setup () {
...
@@ -670,6 +675,7 @@ sub command_line_setup () {
'
mem
'
=>
\
$opt_mem
,
'
mem
'
=>
\
$opt_mem
,
# Misc
# Misc
'
report-features
'
=>
\
$opt_report_features
,
'
comment=s
'
=>
\
$opt_comment
,
'
comment=s
'
=>
\
$opt_comment
,
'
debug
'
=>
\
$opt_debug
,
'
debug
'
=>
\
$opt_debug
,
'
fast
'
=>
\
$opt_fast
,
'
fast
'
=>
\
$opt_fast
,
...
@@ -4190,6 +4196,43 @@ sub run_check_testcase ($$) {
...
@@ -4190,6 +4196,43 @@ sub run_check_testcase ($$) {
return
$res
;
return
$res
;
}
}
##############################################################################
#
# Report the features that were compiled in
#
##############################################################################
sub
run_report_features
()
{
my
$args
;
if
(
!
$glob_use_embedded_server
)
{
mysqld_start
(
$master
->
[
0
],
[]
,
[]
);
if
(
!
$master
->
[
0
]
->
{'
pid
'}
)
{
mtr_error
("
Can't start the mysqld server
");
}
mysqld_wait_started
(
$master
->
[
0
]);
}
my
$tinfo
=
{};
$tinfo
->
{'
name
'}
=
'
report features
';
$tinfo
->
{'
result_file
'}
=
undef
;
$tinfo
->
{'
component_id
'}
=
'
mysqld
';
$tinfo
->
{'
path
'}
=
'
include/report-features.test
';
$tinfo
->
{'
timezone
'}
=
"
GMT-3
";
$tinfo
->
{'
slave_num
'}
=
0
;
$tinfo
->
{'
master_opt
'}
=
[]
;
$tinfo
->
{'
slave_opt
'}
=
[]
;
$tinfo
->
{'
slave_mi
'}
=
[]
;
$tinfo
->
{'
comment
'}
=
'
report server features
';
run_mysqltest
(
$tinfo
);
if
(
!
$glob_use_embedded_server
)
{
stop_all_servers
();
}
}
sub
run_mysqltest
($)
{
sub
run_mysqltest
($)
{
...
@@ -4329,8 +4372,10 @@ sub run_mysqltest ($) {
...
@@ -4329,8 +4372,10 @@ sub run_mysqltest ($) {
mtr_add_arg
(
$args
,
"
--test-file
");
mtr_add_arg
(
$args
,
"
--test-file
");
mtr_add_arg
(
$args
,
$tinfo
->
{'
path
'});
mtr_add_arg
(
$args
,
$tinfo
->
{'
path
'});
mtr_add_arg
(
$args
,
"
--result-file
");
if
(
defined
$tinfo
->
{'
result_file
'}
)
{
mtr_add_arg
(
$args
,
$tinfo
->
{'
result_file
'});
mtr_add_arg
(
$args
,
"
--result-file
");
mtr_add_arg
(
$args
,
$tinfo
->
{'
result_file
'});
}
if
(
$opt_record
)
if
(
$opt_record
)
{
{
...
@@ -4739,3 +4784,4 @@ HERE
...
@@ -4739,3 +4784,4 @@ HERE
mtr_exit
(
1
);
mtr_exit
(
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