Commit 16e9943d authored by Vlad Lesin's avatar Vlad Lesin

MDEV-20421: big_innodb_log reliably fails on buildbot Windows

The test fails because it reuses mysqltest perl code to copy directory
tree, and this code contains Windows-specific piece which outputs some
diagnostic information.

The patch introduces new parameter for that Windows-specific perl code to
have the ability to suppress diagnostic output on the corresponding
mysqltest perl module initialization.
parent 41e351f6
...@@ -24,8 +24,10 @@ use My::Platform; ...@@ -24,8 +24,10 @@ use My::Platform;
my $handle_exe; my $handle_exe;
sub import {
if (IS_WINDOWS){ my $self = shift;
my $params = shift;
return if (!IS_WINDOWS || $handle_exe);
# Check if handle.exe is available # Check if handle.exe is available
# Pass switch to accept the EULA to avoid hanging # Pass switch to accept the EULA to avoid hanging
# if the program hasn't been run before. # if the program hasn't been run before.
...@@ -35,7 +37,7 @@ if (IS_WINDOWS){ ...@@ -35,7 +37,7 @@ if (IS_WINDOWS){
$handle_exe= "$2.$3" $handle_exe= "$2.$3"
if ($line =~ /(Nth|H)andle v([0-9]*)\.([0-9]*)/); if ($line =~ /(Nth|H)andle v([0-9]*)\.([0-9]*)/);
} }
if ($handle_exe){ if ($handle_exe && (!$params || !$params->{suppress_init_messages})){
print "Found handle.exe version $handle_exe\n"; print "Found handle.exe version $handle_exe\n";
} }
} }
......
...@@ -76,6 +76,7 @@ rmdir $targetdir; ...@@ -76,6 +76,7 @@ rmdir $targetdir;
perl; perl;
use lib "lib"; use lib "lib";
use My::Handles { suppress_init_messages => 1 };
use My::File::Path; use My::File::Path;
my $install_db_dir = ($ENV{MTR_PARALLEL} == 1) ? my $install_db_dir = ($ENV{MTR_PARALLEL} == 1) ?
"$ENV{'MYSQLTEST_VARDIR'}/install.db" : "$ENV{'MYSQLTEST_VARDIR'}/install.db" :
......
##############################################################################
#
# List the test cases that are to be disabled temporarily.
#
# Separate the test case name and the comment with ':'.
#
# <testcasename> : BUG#<xxxx> <date disabled> <disabler> <comment>
#
# Do not use any TAB characters for whitespace.
#
##############################################################################
big_innodb_log : MDEV-20421 2019-08-26 wlad Always fails on Windows buildbot
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment