1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Skip test cases if the script or binary they need can't be found

Browse Source
This commit is contained in:
msvensson@pilot.blaudden 2007-04-04 15:40:40 +02:00
parent 3b1fc84a5e
commit 678a358746
4 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -724,8 +724,6 @@ sub command_line_setup () {
{ {
$mysqld_variables{'port'}= 3306; $mysqld_variables{'port'}= 3306;
$mysqld_variables{'master-port'}= 3306; $mysqld_variables{'master-port'}= 3306;
$opt_skip_ndbcluster= 1;
$opt_skip_im= 1;
} }
if ( $opt_comment ) if ( $opt_comment )
@ -1235,6 +1233,7 @@ sub command_line_setup () {
{ {
# Turn off features not supported when running with extern server # Turn off features not supported when running with extern server
$opt_skip_rpl= 1; $opt_skip_rpl= 1;
$opt_skip_ndbcluster= 1;
# Setup master->[0] with the settings for the extern server # Setup master->[0] with the settings for the extern server
$master->[0]->{'path_sock'}= $opt_socket ? $opt_socket : "/tmp/mysql.sock"; $master->[0]->{'path_sock'}= $opt_socket ? $opt_socket : "/tmp/mysql.sock";
@ -2011,10 +2010,7 @@ sub environment_setup () {
$ENV{'MYSQL_FIX_SYSTEM_TABLES'}= $cmdline_mysql_fix_system_tables; $ENV{'MYSQL_FIX_SYSTEM_TABLES'}= $cmdline_mysql_fix_system_tables;
} }
if (!$opt_extern) $ENV{'MYSQL_FIX_PRIVILEGE_TABLES'}= $file_mysql_fix_privilege_tables;
{
$ENV{'MYSQL_FIX_PRIVILEGE_TABLES'}= $file_mysql_fix_privilege_tables;
}
# ---------------------------------------------------- # ----------------------------------------------------
# Setup env so childs can execute my_print_defaults # Setup env so childs can execute my_print_defaults

7
mysql-test/t/fix_priv_tables.test
View File

@ -1,6 +1,13 @@
# Embedded server doesn't support external clients # Embedded server doesn't support external clients
--source include/not_embedded.inc --source include/not_embedded.inc
# Don't run this test if $MYSQL_FIX_PRIVILEGE_TABLES isn't set
# to the location of mysql_fix_privilege_tables.sql
if (`SELECT LENGTH("$MYSQL_FIX_PRIVILEGE_TABLES") <= 0`)
{
skip Test need MYSQL_FIX_PRIVILEGE_TABLES;
}
# #
# This is the test for mysql_fix_privilege_tables # This is the test for mysql_fix_privilege_tables
# It checks that a system tables from mysql 4.1.23 # It checks that a system tables from mysql 4.1.23

8
mysql-test/t/system_mysql_db_fix30020.test
View File

@ -1,8 +1,12 @@
# Embedded server doesn't support external clients # Embedded server doesn't support external clients
--source include/not_embedded.inc --source include/not_embedded.inc
# Windows doesn't support execution of shell scripts (to fix!!) # Don't run this test if $MYSQL_FIX_SYSTEM_TABLES isn't set
--source include/not_windows.inc # to the location of mysql_fix_privilege_tables.sql
if (`SELECT LENGTH("$MYSQL_FIX_SYSTEM_TABLES") <= 0`)
{
skip Test need MYSQL_FIX_SYSTEM_TABLES;
}
# #
# This is the test for mysql_fix_privilege_tables # This is the test for mysql_fix_privilege_tables

7
mysql-test/t/system_mysql_db_fix40123.test
View File

@ -1,6 +1,13 @@
# Embedded server doesn't support external clients # Embedded server doesn't support external clients
--source include/not_embedded.inc --source include/not_embedded.inc
# Don't run this test if $MYSQL_FIX_PRIVILEGE_TABLES isn't set
# to the location of mysql_fix_privilege_tables.sql
if (`SELECT LENGTH("$MYSQL_FIX_PRIVILEGE_TABLES") <= 0`)
{
skip Test need MYSQL_FIX_PRIVILEGE_TABLES;
}
# #
# This is the test for mysql_fix_privilege_tables # This is the test for mysql_fix_privilege_tables
# It checks that a system tables from mysql 4.1.23 # It checks that a system tables from mysql 4.1.23