Skip to content

Commit fc6711c

Browse files
committed
mtr: increase timeouts under ASAN/UBSAN/MSAN
not only under valgrind
1 parent bd0e751 commit fc6711c

File tree

5 files changed

+17
-20
lines changed

5 files changed

+17
-20
lines changed

mysql-test/include/shutdown_mysqld.inc

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,8 @@ if ($rpl_inited)
3131
set @@global.log_warnings=0;
3232
--enable_query_log
3333

34-
--let $server_shutdown_timeout= 60
35-
if ($VALGRIND_TEST)
36-
{
37-
--let $server_shutdown_timeout= 300
38-
}
34+
--source include/slow_environ.inc
35+
--let $server_shutdown_timeout= 60$_timeout_adjustment
3936

4037
if ($shutdown_timeout)
4138
{

mysql-test/include/slow_environ.inc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
if (!$slow_environ_check)
2+
{
3+
let $_timeout_adjustment=;
4+
if (`select $VALGRIND_TEST + count(*) from information_schema.system_variables where variable_name='have_sanitizer' and global_value like '%SAN%'`)
5+
{
6+
let $_timeout_adjustment=0;
7+
}
8+
let $slow_environ_check=1;
9+
}

mysql-test/include/sync_slave_sql_with_io.inc

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,8 @@
2525
let $_slave_timeout= $slave_timeout;
2626
if (!$_slave_timeout)
2727
{
28-
let $_slave_timeout= 300;
29-
if ($VALGRIND_TEST)
30-
{
31-
let $_slave_timeout= 1500;
32-
}
28+
source include/slow_environ.inc;
29+
let $_slave_timeout= 300$_timeout_adjustment;
3330
}
3431

3532
--let $_master_log_file= query_get_value(SHOW SLAVE STATUS, Master_Log_File, 1)

mysql-test/include/sync_with_master_gtid.inc

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,8 @@
3333
let $_slave_timeout= $slave_timeout;
3434
if (!$_slave_timeout)
3535
{
36-
let $_slave_timeout= 120;
37-
if ($VALGRIND_TEST)
38-
{
39-
let $_slave_timeout= 1200;
40-
}
36+
source include/slow_environ.inc;
37+
let $_slave_timeout= 120$_timeout_adjustment;
4138
}
4239

4340
--let $_result= `SELECT master_gtid_wait('$master_pos', $_slave_timeout)`

mysql-test/include/wait_for_slave_param.inc

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,8 @@
4949
let $_slave_timeout= $slave_timeout;
5050
if (!$_slave_timeout)
5151
{
52-
let $_slave_timeout= 300;
53-
if ($VALGRIND_TEST)
54-
{
55-
let $_slave_timeout= 1500;
56-
}
52+
source include/slow_environ.inc;
53+
let $_slave_timeout= 300$_timeout_adjustment;
5754
}
5855

5956
let $_slave_param_comparison= $slave_param_comparison;

0 commit comments

Comments
 (0)