database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Improve --check-testcase

Browse Source
This commit is contained in:
msvensson@pilot.mysql.com
2007-12-19 10:25:21 +01:00
parent f4d93f41bc
commit 7feb6c1abe
2 changed files with 46 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -149,7 +149,7 @@ my $opt_mtr_build_thread= $ENV{'MTR_BUILD_THREAD'} || "auto";
my $opt_record;
my $opt_report_features;
my $opt_check_testcases;
our $opt_check_testcases;
my $opt_mark_progress;
my $opt_sleep;
@@ -2123,6 +2123,7 @@ sub do_before_run_mysqltest($)
sub run_check_testcase_all($$)
{
my ($tinfo, $mode)= @_;
my $result;
foreach my $mysqld ( mysqlds() )
{
@@ -2132,9 +2133,11 @@ sub run_check_testcase_all($$)
{
# Check failed, mark the test case with that info
$tinfo->{'check_testcase_failed'}= 1;
$result= 1;
}
}
}
return $result;
}
@@ -2323,7 +2326,12 @@ sub run_testcase ($) {
if ( $opt_check_testcases )
{
run_check_testcase_all($tinfo, "after");
if (run_check_testcase_all($tinfo, "after"))
{
# Stop all servers that are known to be running
stop_all_servers();
mtr_report("Resuming tests...\n");
}
}
}
elsif ( $res == 62 )
@@ -2602,7 +2610,8 @@ sub mysqld_arguments ($$$) {
}
# Check if "extra_opt" contains skip-log-bin
my $skip_binlog= grep(/^(--|--loose-)skip-log-bin/, @$extra_opt, @opt_extra_mysqld_opt);
my $skip_binlog= grep(/^(--|--loose-)skip-log-bin/,
@$extra_opt, @opt_extra_mysqld_opt);
if ( $opt_debug )
{