database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Immediately skip tests that need innodb if mysqld does not support it

Browse Source 
mysql-test/lib/mtr_cases.pl:
  immediately skip tests that need innodb if mysqld does not support it
mysql-test/mysql-test-run.pl:
  Check if innodb is supported
This commit is contained in:
unknown
2006-09-22 20:58:16 +02:00
parent 72633b36ac
commit c84223043b
2 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/lib/mtr_cases.pl
View File

@ -503,6 +503,13 @@ sub collect_one_test_case($$$$$$$) {
$tinfo->{'skip'}= 1; $tinfo->{'skip'}= 1;
$tinfo->{'comment'}= "Test need debug binaries"; $tinfo->{'comment'}= "Test need debug binaries";
} }
if ( $tinfo->{'innodb_test'} && ! $::glob_innodb_supported )
{
$tinfo->{'skip'}= 1;
$tinfo->{'comment'}= "Test need innodb";
}
} }
# We can't restart a running server that may be in use # We can't restart a running server that may be in use

22
mysql-test/mysql-test-run.pl
View File

@ -333,6 +333,7 @@ our @data_dir_lst;
our $used_binlog_format; our $used_binlog_format;
our $debug_compiled_binaries; our $debug_compiled_binaries;
our $glob_tot_real_time= 0; our $glob_tot_real_time= 0;
our $glob_innodb_supported;
###################################################################### ######################################################################
# #
@ -351,6 +352,7 @@ sub cleanup_stale_files ();
sub check_ssl_support (); sub check_ssl_support ();
sub check_running_as_root(); sub check_running_as_root();
sub check_ndbcluster_support (); sub check_ndbcluster_support ();
sub check_innodb_support ();
sub rm_ndbcluster_tables ($); sub rm_ndbcluster_tables ($);
sub ndbcluster_start_install ($); sub ndbcluster_start_install ($);
sub ndbcluster_start ($$); sub ndbcluster_start ($$);
@ -391,6 +393,7 @@ sub main () {
executable_setup(); executable_setup();
check_ndbcluster_support(); check_ndbcluster_support();
check_innodb_support();
check_ssl_support(); check_ssl_support();
check_debug_support(); check_debug_support();
@ -1832,6 +1835,25 @@ sub check_debug_support () {
$debug_compiled_binaries= 1; $debug_compiled_binaries= 1;
} }
sub check_innodb_support () {
# check innodb support by testing using a switch
# that is only available in that case
if ( mtr_run($exe_mysqld,
["--no-defaults",
"--innodb-data-file-path",
"--help"],
"", "/dev/null", "/dev/null", "") != 0 )
{
# mtr_report("Binaries does not support innodb");
$glob_innodb_supported= 0;
return;
}
mtr_report("Using innodb when necessary");
$glob_innodb_supported= 1;
}
############################################################################## ##############################################################################
# #
# Start the ndb cluster # Start the ndb cluster