Disable valgrind for test in main that takes > 200 seconds

One can run these with --valgrind --big
2025-01-28 17:54:16 +01:00 · 2022-10-04 11:26:50 +03:00 · 2022-10-04 11:26:50 +03:00 · d1bc469dca
commit d1bc469dca
parent d4f6d2f08f
40 changed files with 51 additions and 6 deletions
--- a/mysql-test/include/long_test.inc
+++ b/mysql-test/include/long_test.inc
@ -2,3 +2,5 @@
 # We can use this to schedule such test early (to not be left with
 # only one or two long tests running, and rests of works idle), or to
 # run a quick test skipping long-running test cases.
+
+--source include/no_valgrind_without_big.inc
--- a/mysql-test/main/alter_table.test
+++ b/mysql-test/main/alter_table.test
@ -1,3 +1,4 @@
+--source include/no_valgrind_without_big.inc
 --source include/have_innodb.inc
 #
 # Test of alter table
--- a/mysql-test/main/compress.test
+++ b/mysql-test/main/compress.test
@ -1,6 +1,8 @@
 # Turn on compression between the client and server
 # and run a number of tests

+# Too slow for valgrind
+--source include/no_valgrind_without_big.inc
 # Can't test with embedded server
 -- source include/not_embedded.inc
 -- source include/have_compress.inc
--- a/mysql-test/main/ctype_big5.test
+++ b/mysql-test/main/ctype_big5.test
@ -1,3 +1,4 @@
+-- source include/no_valgrind_without_big.inc
 -- source include/have_big5.inc

 #
--- a/mysql-test/main/ctype_gb2312.test
+++ b/mysql-test/main/ctype_gb2312.test
@ -1,3 +1,4 @@
+-- source include/no_valgrind_without_big.inc
 -- source include/have_gb2312.inc

 #
--- a/mysql-test/main/ctype_gbk.test
+++ b/mysql-test/main/ctype_gbk.test
@ -1,3 +1,4 @@
+--source include/no_valgrind_without_big.inc
 -- source include/have_gbk.inc

 #
--- a/mysql-test/main/ctype_sjis.test
+++ b/mysql-test/main/ctype_sjis.test
@ -1,3 +1,4 @@
+-- source include/no_valgrind_without_big.inc
 -- source include/have_sjis.inc

 #
--- a/mysql-test/main/ctype_utf8.test
+++ b/mysql-test/main/ctype_utf8.test
@ -1,3 +1,4 @@
+--source include/no_valgrind_without_big.inc
 #
 # Tests with the utf8 character set
 #
--- a/mysql-test/main/gis-precise.test
+++ b/mysql-test/main/gis-precise.test
@ -1,5 +1,5 @@
-- source include/have_geometry.inc
-
+--source include/no_valgrind_without_big.inc
+--source include/have_geometry.inc

 #
 # Spatial objects
--- a/mysql-test/main/group_min_max.test
+++ b/mysql-test/main/group_min_max.test
@ -3,6 +3,7 @@
 # The queries in this file test query execution via QUICK_GROUP_MIN_MAX_SELECT.
 #

+--source include/no_valgrind_without_big.inc
 --source include/default_optimizer_switch.inc

 #
--- a/mysql-test/main/index_merge_innodb.test
+++ b/mysql-test/main/index_merge_innodb.test
@ -11,6 +11,7 @@
 #

 # Slow test, don't run during staging part
+--source include/long_test.inc
 --source include/not_staging.inc
 --source include/have_innodb.inc

--- a/mysql-test/main/index_merge_myisam.test
+++ b/mysql-test/main/index_merge_myisam.test
@ -9,6 +9,7 @@
 #               wrapper t/index_merge_innodb.test sources now several 
 #               include/index_merge*.inc files
 #
+--source include/no_valgrind_without_big.inc

 SET STORAGE_ENGINE = MyISAM;
 # MyISAM supports Merge tables
--- a/mysql-test/main/information_schema_all_engines.test
+++ b/mysql-test/main/information_schema_all_engines.test
@ -2,6 +2,7 @@
 # information_schema_db.test whose results depends on which engines are
 # available (since these engines inject tables into INFORMATION_SCHEMA).

+--source include/no_valgrind_without_big.inc
 --source include/not_embedded.inc
 --source include/have_innodb.inc
 --source include/have_perfschema.inc
--- a/mysql-test/main/innodb_ext_key.test
+++ b/mysql-test/main/innodb_ext_key.test
@ -1,4 +1,5 @@
 --source include/innodb_prefix_index_cluster_optimization.inc
+--source include/no_valgrind_without_big.inc

 SET SESSION STORAGE_ENGINE='InnoDB';

--- a/mysql-test/main/join_cache.test
+++ b/mysql-test/main/join_cache.test
@ -1,9 +1,11 @@
+--source include/no_valgrind_without_big.inc
+--source include/default_optimizer_switch.inc
+--source include/default_charset.inc
+
 --disable_warnings
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11;
 DROP DATABASE IF EXISTS world;
 --enable_warnings
--source include/default_optimizer_switch.inc
--source include/default_charset.inc

 set @org_optimizer_switch=@@optimizer_switch;
 set @save_join_cache_level=@@join_cache_level;
--- a/mysql-test/main/mysql_client_test_comp.test
+++ b/mysql-test/main/mysql_client_test_comp.test
@ -3,6 +3,7 @@
 # No need to run this with embedded server
 --source include/not_embedded.inc
 --source include/check_ipv6.inc
+--source include/no_valgrind_without_big.inc

 # need to have the dynamic loading turned on for the client plugin tests
 --source include/have_plugin_auth.inc
--- a/mysql-test/main/mysql_upgrade.test
+++ b/mysql-test/main/mysql_upgrade.test
@ -2,6 +2,7 @@
 -- source include/have_working_dns.inc
 -- source include/have_innodb.inc
 -- source include/have_partition.inc
+-- source include/no_valgrind_without_big.inc

 set sql_mode="";

--- a/mysql-test/main/mysqldump.test
+++ b/mysql-test/main/mysqldump.test
@ -1,3 +1,4 @@
+--source include/no_valgrind_without_big.inc
 --source include/have_utf8mb4.inc

 call mtr.add_suppression("@003f.frm' \\(errno: 22\\)");
--- a/mysql-test/main/order_by.test
+++ b/mysql-test/main/order_by.test
@ -1,3 +1,4 @@
+--source include/no_valgrind_without_big.inc
 #
 # Testing ORDER BY
 #
--- a/mysql-test/main/pool_of_threads.test
+++ b/mysql-test/main/pool_of_threads.test
@ -4,10 +4,11 @@
 -- source include/have_pool_of_threads.inc
 -- source include/default_optimizer_switch.inc

-SET optimizer_switch='outer_join_with_cache=off';
 # Slow test, don't run during staging part
 -- source include/not_staging.inc
 -- source include/long_test.inc
+
+SET optimizer_switch='outer_join_with_cache=off';
 -- source include/common-tests.inc
 SET optimizer_switch=default;

--- a/mysql-test/main/query_cache.test
+++ b/mysql-test/main/query_cache.test
@ -1,5 +1,6 @@
 -- source include/have_query_cache.inc
 -- source include/long_test.inc
+-- source include/no_valgrind_without_big.inc

 set @save_query_cache_size=@@query_cache_size;
 #
--- a/mysql-test/main/query_cache_debug.test
+++ b/mysql-test/main/query_cache_debug.test
@ -2,6 +2,7 @@
 --source include/have_query_cache.inc
 --source include/have_debug_sync.inc
 --source include/long_test.inc
+--source include/no_valgrind_without_big.inc

 set global query_cache_type= ON;
 set @save_query_cache_size=@@global.query_cache_size;
--- a/mysql-test/main/range.test
+++ b/mysql-test/main/range.test
@ -1,3 +1,4 @@
+--source include/no_valgrind_without_big.inc
 #
 # Problem with range optimizer
 #
--- a/mysql-test/main/range_innodb.test
+++ b/mysql-test/main/range_innodb.test
@ -4,6 +4,7 @@

 --source include/have_innodb.inc
 --source include/have_debug.inc
+--source include/no_valgrind_without_big.inc

 --disable_warnings
 drop table if exists t0, t1, t2;
--- a/mysql-test/main/range_vs_index_merge.test
+++ b/mysql-test/main/range_vs_index_merge.test
@ -1,3 +1,4 @@
+--source include/no_valgrind_without_big.inc
 --source include/default_optimizer_switch.inc
 --source include/default_charset.inc
 --source include/have_sequence.inc
--- a/mysql-test/main/rowid_filter_innodb.test
+++ b/mysql-test/main/rowid_filter_innodb.test
@ -1,3 +1,4 @@
+--source include/no_valgrind_without_big.inc
 --source include/have_innodb.inc

 SET SESSION STORAGE_ENGINE='InnoDB';
--- a/mysql-test/main/select.test
+++ b/mysql-test/main/select.test
@ -2,6 +2,8 @@
 # Find string "NOTE NOTE NOTE" in order to find some 'unsure' tests
 #

+--source include/no_valgrind_without_big.inc
+
 #
 # Simple select test
 #
--- a/mysql-test/main/selectivity.test
+++ b/mysql-test/main/selectivity.test
@ -1,3 +1,4 @@
+--source include/no_valgrind_without_big.inc
 --source include/have_stat_tables.inc
 --source include/have_sequence.inc
 --source include/default_charset.inc
--- a/mysql-test/main/sp.test
+++ b/mysql-test/main/sp.test
@ -1,3 +1,4 @@
+--source include/no_valgrind_without_big.inc
 --source include/have_partition.inc
 --source include/have_sequence.inc

--- a/mysql-test/main/ssl.test
+++ b/mysql-test/main/ssl.test
@ -1,3 +1,4 @@
+--source include/no_valgrind_without_big.inc
 # Turn on ssl between the client and server
 # and run a number of tests

--- a/mysql-test/main/stat_tables_disabled.test
+++ b/mysql-test/main/stat_tables_disabled.test
@ -4,7 +4,9 @@ set @innodb_stats_persistent_sample_pages_save=

 set global innodb_stats_persistent= 1;
 set global innodb_stats_persistent_sample_pages=100;
+
 --source include/have_innodb.inc
+--source include/no_valgrind_without_big.inc

 SET SESSION STORAGE_ENGINE='InnoDB';

--- a/mysql-test/main/stat_tables_innodb.test
+++ b/mysql-test/main/stat_tables_innodb.test
@ -1,3 +1,4 @@
+--source include/no_valgrind_without_big.inc
 --source include/have_innodb.inc
 --source include/have_sequence.inc

--- a/mysql-test/main/stat_tables_par_innodb.test
+++ b/mysql-test/main/stat_tables_par_innodb.test
@ -1,3 +1,4 @@
+--source include/no_valgrind_without_big.inc
 --source include/have_innodb.inc

 SET SESSION STORAGE_ENGINE='InnoDB';
--- a/mysql-test/main/statistics.test
+++ b/mysql-test/main/statistics.test
@ -1,3 +1,4 @@
+--source include/no_valgrind_without_big.inc
 --source include/have_stat_tables.inc
 --source include/have_innodb.inc
 --disable_warnings
--- a/mysql-test/main/subselect_innodb.test
+++ b/mysql-test/main/subselect_innodb.test
@ -1,3 +1,4 @@
+-- source include/no_valgrind_without_big.inc
 -- source include/have_innodb.inc

 # Note: the tests uses only non-semijoin subqueries so semi-join switch
--- a/mysql-test/main/subselect_sj.test
+++ b/mysql-test/main/subselect_sj.test
@ -1,3 +1,4 @@
+--source include/no_valgrind_without_big.inc
 #
 # Nested Loops semi-join subquery evaluation tests
 #
--- a/mysql-test/main/subselect_sj_jcl6.test
+++ b/mysql-test/main/subselect_sj_jcl6.test
@ -1,6 +1,7 @@
 # 
 # Run subselect_sj.test with BKA enabled 
 #
+--source include/no_valgrind_without_big.inc
 --source include/default_optimizer_switch.inc

 set @save_optimizer_switch_jcl6=@@optimizer_switch;
--- a/mysql-test/main/trigger.test
+++ b/mysql-test/main/trigger.test
@ -1,6 +1,7 @@
 # This test uses chmod, can't be run with root permissions
 -- source include/not_as_root.inc
--source include/default_charset.inc
+-- source include/no_valgrind_without_big.inc
+-- source include/default_charset.inc

 #
 # Basic triggers test
--- a/mysql-test/main/win.test
+++ b/mysql-test/main/win.test
@ -1,6 +1,7 @@
 #
 #  Window Functions Tests
 #
+--source include/no_valgrind_without_big.inc
 --source include/have_sequence.inc

 --disable_warnings
--- a/mysql-test/main/win_big-mdev-11697.test
+++ b/mysql-test/main/win_big-mdev-11697.test
@ -1,3 +1,5 @@
+--source include/no_valgrind_without_big.inc
+
 create table test_table (id int, random_data varchar(36), static_int int, static_varchar varchar(10));

 insert into test_table(id, random_data, static_int, static_varchar)