Require "--big-test" for certain tests to be run in Valgrind. They will no longer be run per-push, but only in the weekly run.

dahlerlend · dahlerlend · commit 15e78f94e38c · 2013-11-14T05:46:56.000+01:00
diff --git a/mysql-test/suite/funcs_1/t/innodb_views.test b/mysql-test/suite/funcs_1/t/innodb_views.test
@@ -1,5 +1,7 @@
 #### suite/funcs_1/t/innodb_views.test
 
+--source include/no_valgrind_without_big.inc
+
 # InnoDB tables should be used
 #
 # 1. Check if InnoDB is available
diff --git a/mysql-test/suite/innodb/t/innodb-wl5980-discard.test b/mysql-test/suite/innodb/t/innodb-wl5980-discard.test
@@ -2,6 +2,8 @@
 --echo # This test shows DISCARD/IMPORT of a remote tablespace.
 --echo #
 
+--source include/no_valgrind_without_big.inc
+
 # Not supported in embedded
 --source include/not_embedded.inc
 
diff --git a/mysql-test/suite/innodb/t/innodb_stats_auto_recalc_lots.test b/mysql-test/suite/innodb/t/innodb_stats_auto_recalc_lots.test
@@ -2,6 +2,7 @@
 # Test the persistent stats auto recalc on lots of tables
 #
 
+--source include/no_valgrind_without_big.inc
 -- source include/have_innodb.inc
 
 let $check_stats = SELECT table_name, n_rows FROM mysql.innodb_table_stats WHERE table_name LIKE 'ar_%' ORDER BY table_name;
diff --git a/mysql-test/suite/innodb/t/innodb_wl6915.test b/mysql-test/suite/innodb/t/innodb_wl6915.test
@@ -2,6 +2,7 @@
 # WL#6915: InnoDB: Undo logs for temp-tables (and related objects) should
 # reside in temp-tablespace
 #
+--source include/no_valgrind_without_big.inc
 --source include/have_innodb.inc
 
 ################################################################################
diff --git a/mysql-test/suite/innodb_fts/t/innodb_fts_misc.test b/mysql-test/suite/innodb_fts/t/innodb_fts_misc.test
@@ -1,4 +1,5 @@
 --source include/have_innodb.inc
+--source include/no_valgrind_without_big.inc
 
 #------------------------------------------------------------------------------
 # Test With alter/create/drop index
diff --git a/mysql-test/suite/innodb_gis/t/innodb_gis_bug17057168.test b/mysql-test/suite/innodb_gis/t/innodb_gis_bug17057168.test
@@ -5,6 +5,7 @@
 --source include/have_geometry.inc
 --source include/not_embedded.inc
 --source include/have_debug.inc
+--source include/no_valgrind_without_big.inc
 
 --disable_warnings
 DROP DATABASE IF EXISTS geotest;
diff --git a/mysql-test/suite/parts/t/partition_alter2_1_myisam.test b/mysql-test/suite/parts/t/partition_alter2_1_myisam.test
@@ -46,6 +46,8 @@ let $more_pk_ui_tests= 0;
 # Does not work with --embedded
 --source include/not_embedded.inc
 
+--source include/no_valgrind_without_big.inc
+
 #------------------------------------------------------------------------------#
 # Engine specific settings and requirements
 
diff --git a/mysql-test/suite/parts/t/partition_alter2_2_myisam.test b/mysql-test/suite/parts/t/partition_alter2_2_myisam.test
@@ -46,6 +46,8 @@ let $more_pk_ui_tests= 0;
 # Does not work with --embedded
 --source include/not_embedded.inc
 
+--source include/no_valgrind_without_big.inc
+
 #------------------------------------------------------------------------------#
 # Engine specific settings and requirements
 
diff --git a/mysql-test/suite/parts/t/partition_engine_innodb.test b/mysql-test/suite/parts/t/partition_engine_innodb.test
@@ -45,6 +45,8 @@ let $more_pk_ui_tests= 0;
 # Does not work with --embedded
 --source include/not_embedded.inc
 
+--source include/no_valgrind_without_big.inc
+
 #------------------------------------------------------------------------------#
 # Engine specific settings and requirements
 
diff --git a/mysql-test/suite/rpl/t/rpl_binlog_errors.test b/mysql-test/suite/rpl/t/rpl_binlog_errors.test
@@ -17,6 +17,8 @@
 # The size of the data is tuned to match file sizes and rotations, so
 # it is only executed in statement-based replication.
 
+
+-- source include/no_valgrind_without_big.inc
 -- source include/have_innodb.inc
 -- source include/have_debug.inc
 -- source include/master-slave.inc
diff --git a/mysql-test/suite/rpl/t/rpl_parallel_ddl.test b/mysql-test/suite/rpl/t/rpl_parallel_ddl.test
@@ -3,6 +3,8 @@
 #but needs to be kept for tests that would need MyISAM in future.
 --source include/force_myisam_default.inc
 
+--source include/no_valgrind_without_big.inc
+
 #
 # WL#5569 MTS
 #
diff --git a/mysql-test/suite/rpl/t/rpl_test_framework.test b/mysql-test/suite/rpl/t/rpl_test_framework.test
@@ -3,6 +3,8 @@
 #but needs to be kept for tests that would need MyISAM in future.
 --source include/force_myisam_default.inc
 
+--source include/no_valgrind_without_big.inc
+
 # ==== Purpose ====
 #
 # Test that the sync chain generated by
diff --git a/mysql-test/t/index_merge_intersect_dml.test b/mysql-test/t/index_merge_intersect_dml.test
@@ -1,5 +1,5 @@
 #
 # index_merge tests for statements using intersect algorithm
 #
-
+--source include/no_valgrind_without_big.inc
 --source include/index_merge_intersect_dml.inc
diff --git a/mysql-test/t/information_schema.test b/mysql-test/t/information_schema.test
@@ -3,6 +3,8 @@
 #but needs to be kept for tests that would need MyISAM in future.
 --source include/force_myisam_default.inc
 
+--source include/no_valgrind_without_big.inc
+
 # This test  uses grants, which can't get tested for embedded server
 -- source include/not_embedded.inc
 
diff --git a/mysql-test/t/innodb_mrr.test b/mysql-test/t/innodb_mrr.test
@@ -3,6 +3,7 @@
 # (Turns off all other 6.0 optimizer switches than MRR)
 #
 
+--source include/no_valgrind_without_big.inc
 --source include/have_innodb.inc
 --source include/have_mrr.inc
 
diff --git a/mysql-test/t/innodb_mrr_all.test b/mysql-test/t/innodb_mrr_all.test
@@ -3,6 +3,7 @@
 # (Runs with all 6.0 optimizer switches on)
 #
 
+--source include/no_valgrind_without_big.inc
 --source include/have_innodb.inc
 --source include/have_semijoin.inc
 --source include/have_materialization.inc
diff --git a/mysql-test/t/innodb_mrr_cost.test b/mysql-test/t/innodb_mrr_cost.test
@@ -3,6 +3,7 @@
 # (Turns off all other 6.0 optimizer switches than MRR)
 #
 
+--source include/no_valgrind_without_big.inc
 --source include/have_innodb.inc
 --source include/have_mrr.inc
 
diff --git a/mysql-test/t/innodb_mrr_cost_all.test b/mysql-test/t/innodb_mrr_cost_all.test
@@ -3,6 +3,7 @@
 # (Runs with all 6.0 optimizer switches on)
 #
 
+--source include/no_valgrind_without_big.inc
 --source include/have_innodb.inc
 --source include/have_semijoin.inc
 --source include/have_materialization.inc
diff --git a/mysql-test/t/innodb_mrr_cost_icp.test b/mysql-test/t/innodb_mrr_cost_icp.test
@@ -3,6 +3,7 @@
 # (Turns off all other 6.0 optimizer switches than MRR and ICP)
 #
 
+--source include/no_valgrind_without_big.inc
 --source include/have_innodb.inc
 --source include/have_mrr.inc
 --source include/have_index_condition_pushdown.inc
diff --git a/mysql-test/t/innodb_mrr_icp.test b/mysql-test/t/innodb_mrr_icp.test
@@ -3,6 +3,7 @@
 # (Turns off all other 6.0 optimizer switches than MRR and ICP)
 #
 
+--source include/no_valgrind_without_big.inc
 --source include/have_innodb.inc
 --source include/have_mrr.inc
 --source include/have_index_condition_pushdown.inc
diff --git a/mysql-test/t/innodb_mrr_none.test b/mysql-test/t/innodb_mrr_none.test
@@ -3,6 +3,7 @@
 # (Turns off all 6.0 optimizer switches, even MRR)
 # 
 
+--source include/no_valgrind_without_big.inc
 --source include/have_innodb.inc
 
 --disable_query_log
diff --git a/mysql-test/t/insert.test b/mysql-test/t/insert.test
@@ -1,4 +1,6 @@
 
+--source include/no_valgrind_without_big.inc
+
 #
 # Test of refering to old values
 #
diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test
@@ -1,4 +1,6 @@
 
+--source include/no_valgrind_without_big.inc
+
 # Embedded server doesn't support external clients
 --source include/not_embedded.inc
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`#### suite/funcs_1/t/innodb_views.test`
`2`	`2`
	`3`	`+--source include/no_valgrind_without_big.inc`
	`4`	`+`
`3`	`5`	`# InnoDB tables should be used`
`4`	`6`	`#`
`5`	`7`	`# 1. Check if InnoDB is available`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`# Test the persistent stats auto recalc on lots of tables`
`3`	`3`	`#`
`4`	`4`
	`5`	`+--source include/no_valgrind_without_big.inc`
`5`	`6`	`-- source include/have_innodb.inc`
`6`	`7`
`7`	`8`	`let $check_stats = SELECT table_name, n_rows FROM mysql.innodb_table_stats WHERE table_name LIKE 'ar_%' ORDER BY table_name;`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`# WL#6915: InnoDB: Undo logs for temp-tables (and related objects) should`
`3`	`3`	`# reside in temp-tablespace`
`4`	`4`	`#`
	`5`	`+--source include/no_valgrind_without_big.inc`
`5`	`6`	`--source include/have_innodb.inc`
`6`	`7`
`7`	`8`	`################################################################################`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`--source include/have_innodb.inc`
	`2`	`+--source include/no_valgrind_without_big.inc`
`2`	`3`
`3`	`4`	`#------------------------------------------------------------------------------`
`4`	`5`	`# Test With alter/create/drop index`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,8 @@`
`3`	`3`	`#but needs to be kept for tests that would need MyISAM in future.`
`4`	`4`	`--source include/force_myisam_default.inc`
`5`	`5`
	`6`	`+--source include/no_valgrind_without_big.inc`
	`7`	`+`
`6`	`8`	`#`
`7`	`9`	`# WL#5569 MTS`
`8`	`10`	`#`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#`
`2`	`2`	`# index_merge tests for statements using intersect algorithm`
`3`	`3`	`#`
`4`		`-`
	`4`	`+--source include/no_valgrind_without_big.inc`
`5`	`5`	`--source include/index_merge_intersect_dml.inc`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`# (Turns off all other 6.0 optimizer switches than MRR)`
`4`	`4`	`#`
`5`	`5`
	`6`	`+--source include/no_valgrind_without_big.inc`
`6`	`7`	`--source include/have_innodb.inc`
`7`	`8`	`--source include/have_mrr.inc`
`8`	`9`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`# (Runs with all 6.0 optimizer switches on)`
`4`	`4`	`#`
`5`	`5`
	`6`	`+--source include/no_valgrind_without_big.inc`
`6`	`7`	`--source include/have_innodb.inc`
`7`	`8`	`--source include/have_semijoin.inc`
`8`	`9`	`--source include/have_materialization.inc`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`# (Turns off all 6.0 optimizer switches, even MRR)`
`4`	`4`	`#`
`5`	`5`
	`6`	`+--source include/no_valgrind_without_big.inc`
`6`	`7`	`--source include/have_innodb.inc`
`7`	`8`
`8`	`9`	`--disable_query_log`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`
	`2`	`+--source include/no_valgrind_without_big.inc`
	`3`	`+`
`2`	`4`	`#`
`3`	`5`	`# Test of refering to old values`
`4`	`6`	`#`