mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
mysql-test-run.pl:
Not to conflict with Windows return code 2 for "not found", use 62 for "skip" init_db.sql: Initial db updates mysql-test/lib/init_db.sql: Initial db updates mysql-test/mysql-test-run.pl: Not to conflict with Windows return code 2 for "not found", use 62 for "skip"
This commit is contained in:
@ -1497,15 +1497,15 @@ sub run_testcase ($) {
|
||||
{
|
||||
mtr_report_test_passed($tinfo);
|
||||
}
|
||||
elsif ( $res == 2 )
|
||||
elsif ( $res == 62 )
|
||||
{
|
||||
# Testcase itself tell us to skip this one
|
||||
mtr_report_test_skipped($tinfo);
|
||||
}
|
||||
else
|
||||
{
|
||||
# Test case failed
|
||||
if ( $res > 2 )
|
||||
# Test case failed, if in control mysqltest returns 1
|
||||
if ( $res != 1 )
|
||||
{
|
||||
mtr_tofile($path_timefile,
|
||||
"mysqltest returned unexpected code $res, " .
|
||||
@ -2129,7 +2129,7 @@ sub run_mysqltest ($$) {
|
||||
mysqld_arguments($args,'master',0,$tinfo->{'master_opt'},[]);
|
||||
}
|
||||
|
||||
return mtr_run_test($exe_mysqltest,$args,$tinfo->{'path'},"",$path_timefile,"");
|
||||
return mtr_run_test($exe,$args,$tinfo->{'path'},"",$path_timefile,"");
|
||||
}
|
||||
|
||||
##############################################################################
|
||||
|
Reference in New Issue
Block a user