Valgrind: Disable tests that would often time out

Starting with 10.5, InnoDB crash recovery tests seem to time out more easily under Valgrind, which emulates multiple threads by interleaving them in a single operating system thread. These tests will still be covered by AddressSanitizer and MemorySanitizer.
MariaDB · Jul 1, 2022 · b546913 · b546913
1 parent f096870
commit b546913
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 2 deletions.
diff --git a/mysql-test/suite/innodb/t/alter_copy.test b/mysql-test/suite/innodb/t/alter_copy.test
@@ -2,8 +2,7 @@
 --source include/have_debug.inc
 --source include/have_debug_sync.inc
 --source include/not_embedded.inc
-# Valgrind gives leaks from the first shutdown which confuses mtr
-#--source include/not_valgrind.inc
+--source include/no_valgrind_without_big.inc
 
 --echo #
 --echo # MDEV-11415 AVOID INTERMEDIATE COMMIT WHILE DOING

diff --git a/mysql-test/suite/innodb/t/blob-crash.test b/mysql-test/suite/innodb/t/blob-crash.test
@@ -1,5 +1,6 @@
 --source include/maybe_debug.inc
 --source include/innodb_page_size_small.inc
+--source include/no_valgrind_without_big.inc
 
 --echo #
 --echo # Bug #16963396 INNODB: USE OF LARGE EXTERNALLY-STORED FIELDS MAKES

diff --git a/mysql-test/suite/innodb/t/log_file_name_debug.test b/mysql-test/suite/innodb/t/log_file_name_debug.test
@@ -2,6 +2,7 @@
 # Embedded server does not support restarting
 --source include/not_embedded.inc
 --source include/have_debug.inc
+--source include/no_valgrind_without_big.inc
 
 --echo #
 --echo # Bug#19685095 DO NOT CARE ABOUT UNRESOLVED MLOG_FILE_NAME

diff --git a/mysql-test/suite/innodb/t/read_only_recover_committed.test b/mysql-test/suite/innodb/t/read_only_recover_committed.test
@@ -3,6 +3,7 @@
 --source include/have_debug_sync.inc
 # need to restart server
 --source include/not_embedded.inc
+--source include/no_valgrind_without_big.inc
 
 --disable_query_log
 # Ignore messages from the innodb_force_recovery=5 startup.

diff --git a/mysql-test/suite/innodb/t/table_flags.test b/mysql-test/suite/innodb/t/table_flags.test
@@ -2,6 +2,7 @@
 # Embedded server tests do not support restarting
 --source include/not_embedded.inc
 --source include/maybe_debug.inc
+--source include/no_valgrind_without_big.inc
 
 --disable_query_log
 call mtr.add_suppression("InnoDB: Table `mysql`\\.`innodb_table_stats` not found");

diff --git a/mysql-test/suite/innodb/t/xa_recovery.test b/mysql-test/suite/innodb/t/xa_recovery.test
@@ -1,6 +1,7 @@
 --source include/have_innodb.inc
 # Embedded server does not support restarting.
 --source include/not_embedded.inc
+--source include/no_valgrind_without_big.inc
 
 # MDEV-8841 - close tables opened by previous tests, 
 # so they don't get marked crashed when the server gets crashed

diff --git a/mysql-test/suite/multi_source/multi_parallel.test b/mysql-test/suite/multi_source/multi_parallel.test
@@ -2,6 +2,7 @@
 # Slave_non_transactional_groups, Slave_transactional_groups
 --source include/not_embedded.inc
 --source include/have_innodb.inc
+--source include/no_valgrind_without_big.inc
 --let $rpl_server_count= 0
 
 --connect (master1,127.0.0.1,root,,,$SERVER_MYPORT_1)