diff options
| author | Vlad Lesin <vlad_lesin@mail.ru> | 2019-09-04 10:31:40 +0300 |
|---|---|---|
| committer | Vlad Lesin <vlad_lesin@mail.ru> | 2019-09-04 10:31:40 +0300 |
| commit | ff9c4664be20e8dbb5fa57c662f55f57cc6a0acb (patch) | |
| tree | e6368ae039d32f6fcb627a2532dc013699bc5f04 | |
| parent | 6ee7a9a43876e6ffd2cad8e12bdd455f252a976a (diff) | |
| download | mariadb-git-bb-10.2-MDEV-20421-big_innodb_log.tar.gz | |
MDEV-20421: big_innodb_log reliably fails on buildbot Windowsbb-10.2-MDEV-20421-big_innodb_log
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.
| -rw-r--r-- | mysql-test/lib/My/Handles.pm | 29 | ||||
| -rw-r--r-- | mysql-test/suite/mariabackup/big_innodb_log.test | 1 | ||||
| -rw-r--r-- | mysql-test/suite/mariabackup/disabled.def | 12 |
3 files changed, 17 insertions, 25 deletions
diff --git a/mysql-test/lib/My/Handles.pm b/mysql-test/lib/My/Handles.pm index c07e2edb09e..dfb7fb1112d 100644 --- a/mysql-test/lib/My/Handles.pm +++ b/mysql-test/lib/My/Handles.pm @@ -24,19 +24,22 @@ use My::Platform; my $handle_exe; - -if (IS_WINDOWS){ - # Check if handle.exe is available - # Pass switch to accept the EULA to avoid hanging - # if the program hasn't been run before. - my $list= `handle.exe -? -accepteula 2>&1`; - foreach my $line (split('\n', $list)) - { - $handle_exe= "$2.$3" - if ($line =~ /(Nth|H)andle v([0-9]*)\.([0-9]*)/); - } - if ($handle_exe){ - print "Found handle.exe version $handle_exe\n"; +sub import { + my $self = shift; + my $params = shift; + if (IS_WINDOWS && !$handle_exe){ + # Check if handle.exe is available + # Pass switch to accept the EULA to avoid hanging + # if the program hasn't been run before. + my $list= `handle.exe -? -accepteula 2>&1`; + foreach my $line (split('\n', $list)) + { + $handle_exe= "$2.$3" + if ($line =~ /(Nth|H)andle v([0-9]*)\.([0-9]*)/); + } + if ($handle_exe && (!$params || !$params->{suppress_init_messages})){ + print "Found handle.exe version $handle_exe\n"; + } } } diff --git a/mysql-test/suite/mariabackup/big_innodb_log.test b/mysql-test/suite/mariabackup/big_innodb_log.test index 05dc3aa39c5..4a87ecb18fe 100644 --- a/mysql-test/suite/mariabackup/big_innodb_log.test +++ b/mysql-test/suite/mariabackup/big_innodb_log.test @@ -76,6 +76,7 @@ rmdir $targetdir; perl; use lib "lib"; +use My::Handles { suppress_init_messages => 1 }; use My::File::Path; my $install_db_dir = ($ENV{MTR_PARALLEL} == 1) ? "$ENV{'MYSQLTEST_VARDIR'}/install.db" : diff --git a/mysql-test/suite/mariabackup/disabled.def b/mysql-test/suite/mariabackup/disabled.def deleted file mode 100644 index 88a66df052d..00000000000 --- a/mysql-test/suite/mariabackup/disabled.def +++ /dev/null @@ -1,12 +0,0 @@ -############################################################################## -# -# 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 |