From e47bd0073cc082a4a7668ace1d272fa3bea538ab Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Mon, 9 Dec 2019 20:23:51 +0100 Subject: [PATCH] MDEV-21262 MTR does not work with Windows ASAN builds Do not use suppressions on Windows, the ASAN_OPTIONS can't be parsed whenever full file names are used, because file names contain ':' which is ASAN_OPTIONS delimeter. --- mysql-test/mysql-test-run.pl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 98a8e90556e..16f6d2b7a93 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1788,14 +1788,14 @@ sub command_line_setup { $ENV{ASAN_OPTIONS}= "abort_on_error=1:" . ($ENV{ASAN_OPTIONS} || ''); $ENV{ASAN_OPTIONS}= "suppressions=${glob_mysql_test_dir}/asan.supp:" . $ENV{ASAN_OPTIONS} - if -f "$glob_mysql_test_dir/asan.supp"; + if -f "$glob_mysql_test_dir/asan.supp" and not IS_WINDOWS; # The following can be useful when a test fails without any asan report # on stderr like with openssl_1.test # $ENV{ASAN_OPTIONS}= "log_path=${opt_vardir}/log/asan:" . $ENV{ASAN_OPTIONS}; # Add leak suppressions $ENV{LSAN_OPTIONS}= "suppressions=${glob_mysql_test_dir}/lsan.supp" - if -f "$glob_mysql_test_dir/lsan.supp"; + if -f "$glob_mysql_test_dir/lsan.supp" and not IS_WINDOWS; if ( $opt_gdb || $opt_client_gdb || $opt_ddd || $opt_client_ddd || $opt_manual_gdb || $opt_manual_lldb || $opt_manual_ddd || @@ -1819,6 +1819,7 @@ sub command_line_setup { # One day for PID file creation (this is given in seconds not minutes) $opt_start_timeout= 24 * 60 * 60; } + mtr_verbose("ASAN_OPTIONS=$ENV{ASAN_OPTIONS}"); # -------------------------------------------------------------------------- # Modified behavior with --start options