Commit d1bc469d authored by Monty's avatar Monty

Disable valgrind for test in main that takes > 200 seconds

One can run these with --valgrind --big
parent d4f6d2f0
...@@ -2,3 +2,5 @@ ...@@ -2,3 +2,5 @@
# We can use this to schedule such test early (to not be left with # 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 # only one or two long tests running, and rests of works idle), or to
# run a quick test skipping long-running test cases. # run a quick test skipping long-running test cases.
--source include/no_valgrind_without_big.inc
--source include/no_valgrind_without_big.inc
--source include/have_innodb.inc --source include/have_innodb.inc
# #
# Test of alter table # Test of alter table
......
# Turn on compression between the client and server # Turn on compression between the client and server
# and run a number of tests # and run a number of tests
# Too slow for valgrind
--source include/no_valgrind_without_big.inc
# Can't test with embedded server # Can't test with embedded server
-- source include/not_embedded.inc -- source include/not_embedded.inc
-- source include/have_compress.inc -- source include/have_compress.inc
......
-- source include/no_valgrind_without_big.inc
-- source include/have_big5.inc -- source include/have_big5.inc
# #
......
-- source include/no_valgrind_without_big.inc
-- source include/have_gb2312.inc -- source include/have_gb2312.inc
# #
......
--source include/no_valgrind_without_big.inc
-- source include/have_gbk.inc -- source include/have_gbk.inc
# #
......
-- source include/no_valgrind_without_big.inc
-- source include/have_sjis.inc -- source include/have_sjis.inc
# #
......
--source include/no_valgrind_without_big.inc
# #
# Tests with the utf8 character set # Tests with the utf8 character set
# #
......
-- source include/have_geometry.inc --source include/no_valgrind_without_big.inc
--source include/have_geometry.inc
# #
# Spatial objects # Spatial objects
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
# The queries in this file test query execution via QUICK_GROUP_MIN_MAX_SELECT. # 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 --source include/default_optimizer_switch.inc
# #
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
# #
# Slow test, don't run during staging part # Slow test, don't run during staging part
--source include/long_test.inc
--source include/not_staging.inc --source include/not_staging.inc
--source include/have_innodb.inc --source include/have_innodb.inc
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
# wrapper t/index_merge_innodb.test sources now several # wrapper t/index_merge_innodb.test sources now several
# include/index_merge*.inc files # include/index_merge*.inc files
# #
--source include/no_valgrind_without_big.inc
SET STORAGE_ENGINE = MyISAM; SET STORAGE_ENGINE = MyISAM;
# MyISAM supports Merge tables # MyISAM supports Merge tables
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
# information_schema_db.test whose results depends on which engines are # information_schema_db.test whose results depends on which engines are
# available (since these engines inject tables into INFORMATION_SCHEMA). # available (since these engines inject tables into INFORMATION_SCHEMA).
--source include/no_valgrind_without_big.inc
--source include/not_embedded.inc --source include/not_embedded.inc
--source include/have_innodb.inc --source include/have_innodb.inc
--source include/have_perfschema.inc --source include/have_perfschema.inc
......
--source include/innodb_prefix_index_cluster_optimization.inc --source include/innodb_prefix_index_cluster_optimization.inc
--source include/no_valgrind_without_big.inc
SET SESSION STORAGE_ENGINE='InnoDB'; SET SESSION STORAGE_ENGINE='InnoDB';
......
--source include/no_valgrind_without_big.inc
--source include/default_optimizer_switch.inc
--source include/default_charset.inc
--disable_warnings --disable_warnings
DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11; DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11;
DROP DATABASE IF EXISTS world; DROP DATABASE IF EXISTS world;
--enable_warnings --enable_warnings
--source include/default_optimizer_switch.inc
--source include/default_charset.inc
set @org_optimizer_switch=@@optimizer_switch; set @org_optimizer_switch=@@optimizer_switch;
set @save_join_cache_level=@@join_cache_level; set @save_join_cache_level=@@join_cache_level;
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
# No need to run this with embedded server # No need to run this with embedded server
--source include/not_embedded.inc --source include/not_embedded.inc
--source include/check_ipv6.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 # need to have the dynamic loading turned on for the client plugin tests
--source include/have_plugin_auth.inc --source include/have_plugin_auth.inc
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
-- source include/have_working_dns.inc -- source include/have_working_dns.inc
-- source include/have_innodb.inc -- source include/have_innodb.inc
-- source include/have_partition.inc -- source include/have_partition.inc
-- source include/no_valgrind_without_big.inc
set sql_mode=""; set sql_mode="";
......
--source include/no_valgrind_without_big.inc
--source include/have_utf8mb4.inc --source include/have_utf8mb4.inc
call mtr.add_suppression("@003f.frm' \\(errno: 22\\)"); call mtr.add_suppression("@003f.frm' \\(errno: 22\\)");
......
--source include/no_valgrind_without_big.inc
# #
# Testing ORDER BY # Testing ORDER BY
# #
......
...@@ -4,10 +4,11 @@ ...@@ -4,10 +4,11 @@
-- source include/have_pool_of_threads.inc -- source include/have_pool_of_threads.inc
-- source include/default_optimizer_switch.inc -- source include/default_optimizer_switch.inc
SET optimizer_switch='outer_join_with_cache=off';
# Slow test, don't run during staging part # Slow test, don't run during staging part
-- source include/not_staging.inc -- source include/not_staging.inc
-- source include/long_test.inc -- source include/long_test.inc
SET optimizer_switch='outer_join_with_cache=off';
-- source include/common-tests.inc -- source include/common-tests.inc
SET optimizer_switch=default; SET optimizer_switch=default;
......
-- source include/have_query_cache.inc -- source include/have_query_cache.inc
-- source include/long_test.inc -- source include/long_test.inc
-- source include/no_valgrind_without_big.inc
set @save_query_cache_size=@@query_cache_size; set @save_query_cache_size=@@query_cache_size;
# #
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
--source include/have_query_cache.inc --source include/have_query_cache.inc
--source include/have_debug_sync.inc --source include/have_debug_sync.inc
--source include/long_test.inc --source include/long_test.inc
--source include/no_valgrind_without_big.inc
set global query_cache_type= ON; set global query_cache_type= ON;
set @save_query_cache_size=@@global.query_cache_size; set @save_query_cache_size=@@global.query_cache_size;
......
--source include/no_valgrind_without_big.inc
# #
# Problem with range optimizer # Problem with range optimizer
# #
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
--source include/have_innodb.inc --source include/have_innodb.inc
--source include/have_debug.inc --source include/have_debug.inc
--source include/no_valgrind_without_big.inc
--disable_warnings --disable_warnings
drop table if exists t0, t1, t2; drop table if exists t0, t1, t2;
......
--source include/no_valgrind_without_big.inc
--source include/default_optimizer_switch.inc --source include/default_optimizer_switch.inc
--source include/default_charset.inc --source include/default_charset.inc
--source include/have_sequence.inc --source include/have_sequence.inc
......
--source include/no_valgrind_without_big.inc
--source include/have_innodb.inc --source include/have_innodb.inc
SET SESSION STORAGE_ENGINE='InnoDB'; SET SESSION STORAGE_ENGINE='InnoDB';
......
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
# Find string "NOTE NOTE NOTE" in order to find some 'unsure' tests # Find string "NOTE NOTE NOTE" in order to find some 'unsure' tests
# #
--source include/no_valgrind_without_big.inc
# #
# Simple select test # Simple select test
# #
......
--source include/no_valgrind_without_big.inc
--source include/have_stat_tables.inc --source include/have_stat_tables.inc
--source include/have_sequence.inc --source include/have_sequence.inc
--source include/default_charset.inc --source include/default_charset.inc
......
--source include/no_valgrind_without_big.inc
--source include/have_partition.inc --source include/have_partition.inc
--source include/have_sequence.inc --source include/have_sequence.inc
......
--source include/no_valgrind_without_big.inc
# Turn on ssl between the client and server # Turn on ssl between the client and server
# and run a number of tests # and run a number of tests
......
...@@ -4,7 +4,9 @@ set @innodb_stats_persistent_sample_pages_save= ...@@ -4,7 +4,9 @@ set @innodb_stats_persistent_sample_pages_save=
set global innodb_stats_persistent= 1; set global innodb_stats_persistent= 1;
set global innodb_stats_persistent_sample_pages=100; set global innodb_stats_persistent_sample_pages=100;
--source include/have_innodb.inc --source include/have_innodb.inc
--source include/no_valgrind_without_big.inc
SET SESSION STORAGE_ENGINE='InnoDB'; SET SESSION STORAGE_ENGINE='InnoDB';
......
--source include/no_valgrind_without_big.inc
--source include/have_innodb.inc --source include/have_innodb.inc
--source include/have_sequence.inc --source include/have_sequence.inc
......
--source include/no_valgrind_without_big.inc
--source include/have_innodb.inc --source include/have_innodb.inc
SET SESSION STORAGE_ENGINE='InnoDB'; SET SESSION STORAGE_ENGINE='InnoDB';
......
--source include/no_valgrind_without_big.inc
--source include/have_stat_tables.inc --source include/have_stat_tables.inc
--source include/have_innodb.inc --source include/have_innodb.inc
--disable_warnings --disable_warnings
......
-- source include/no_valgrind_without_big.inc
-- source include/have_innodb.inc -- source include/have_innodb.inc
# Note: the tests uses only non-semijoin subqueries so semi-join switch # Note: the tests uses only non-semijoin subqueries so semi-join switch
......
--source include/no_valgrind_without_big.inc
# #
# Nested Loops semi-join subquery evaluation tests # Nested Loops semi-join subquery evaluation tests
# #
......
# #
# Run subselect_sj.test with BKA enabled # Run subselect_sj.test with BKA enabled
# #
--source include/no_valgrind_without_big.inc
--source include/default_optimizer_switch.inc --source include/default_optimizer_switch.inc
set @save_optimizer_switch_jcl6=@@optimizer_switch; set @save_optimizer_switch_jcl6=@@optimizer_switch;
......
# This test uses chmod, can't be run with root permissions # This test uses chmod, can't be run with root permissions
-- source include/not_as_root.inc -- 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 # Basic triggers test
......
# #
# Window Functions Tests # Window Functions Tests
# #
--source include/no_valgrind_without_big.inc
--source include/have_sequence.inc --source include/have_sequence.inc
--disable_warnings --disable_warnings
......
--source include/no_valgrind_without_big.inc
create table test_table (id int, random_data varchar(36), static_int int, static_varchar varchar(10)); 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) insert into test_table(id, random_data, static_int, static_varchar)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment