Added big-tets flag to tests that take close to a minute or more

agopi · agopi · commit 602c8e687f23 · 2014-12-12T02:35:29.000+01:00
diff --git a/mysql-test/suite/innodb/t/innodb_bug30423.test b/mysql-test/suite/innodb/t/innodb_bug30423.test
@@ -1,5 +1,4 @@
-#Want to skip this test from daily Valgrind execution
---source include/no_valgrind_without_big.inc
+-- source include/big_test.inc
 # Test for Bug #30423, InnoDBs treatment of NULL in index stats causes
 # bad "rows examined" estimates.
 # Implemented InnoDB system variable "innodb_stats_method" with
diff --git a/mysql-test/suite/innodb/t/innodb_bug53290.test b/mysql-test/suite/innodb/t/innodb_bug53290.test
@@ -1,6 +1,4 @@
-#Want to skip this test from daily Valgrind execution
---source include/no_valgrind_without_big.inc
-
+-- source include/big_test.inc
 -- source include/have_innodb.inc
 
 create table bug53290 (x bigint) engine=innodb;
diff --git a/mysql-test/suite/innodb_zip/t/16k.test b/mysql-test/suite/innodb_zip/t/16k.test
@@ -1,7 +1,5 @@
-#Want to skip this test from daily Valgrind execution
---source include/no_valgrind_without_big.inc
 # Tests for setting innodb-page-size=16k; default value
-
+-- source include/big_test.inc
 --source include/have_innodb.inc
 --source include/have_innodb_16k.inc
 SET default_storage_engine=InnoDB;
diff --git a/mysql-test/suite/innodb_zip/t/innochecksum_2.test b/mysql-test/suite/innodb_zip/t/innochecksum_2.test
@@ -4,7 +4,7 @@
 --source include/have_innodb.inc
 
 --source include/not_embedded.inc
---source include/no_valgrind_without_big.inc
+-- source include/big_test.inc
 
 --disable_query_log
 # This warning occurs due to small buffer pool size(i.e. 8MB). It doesn't occur
diff --git a/mysql-test/suite/innodb_zip/t/wl6347_comp_indx_stat.test b/mysql-test/suite/innodb_zip/t/wl6347_comp_indx_stat.test
@@ -12,7 +12,7 @@
 -- source include/have_innodb.inc
 -- source include/not_embedded.inc
 -- source include/have_innodb_16k.inc
--- source include/no_valgrind_without_big.inc
+-- source include/big_test.inc
 
 -- vertical_results
 
diff --git a/mysql-test/suite/innodb_zip/t/wl6560.test b/mysql-test/suite/innodb_zip/t/wl6560.test
@@ -5,7 +5,7 @@
 --source include/have_innodb.inc
 # Embedded server does not restart of server
 --source include/not_embedded.inc
---source include/no_valgrind_without_big.inc
+-- source include/big_test.inc
 
 --disable_query_log
 call mtr.add_suppression("Tablespace innodb_temporary ran out of space. Please add another file or use 'autoextend' for the last file in setting innodb_temp_data_file_path.");
diff --git a/mysql-test/suite/rpl/t/rpl_gtid_mode.test b/mysql-test/suite/rpl/t/rpl_gtid_mode.test
@@ -47,7 +47,7 @@
 # ==== References ====
 #
 # Added in WL#3584 - Global Transaction Identifiers
---source include/no_valgrind_without_big.inc
+-- source include/big_test.inc
 --source include/not_windows.inc
 --source include/not_gtid_enabled.inc
 --disable_warnings
diff --git a/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test b/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test
@@ -9,7 +9,7 @@
 # * Various states of master and heartbeat
 # * Circular replication
 #
---source include/no_valgrind_without_big.inc
+-- source include/big_test.inc
 --source include/master-slave.inc
 #
 # The test runs long and does not have any specifics to 
diff --git a/mysql-test/suite/rpl/t/rpl_mixed_drop_create_temp_table.test b/mysql-test/suite/rpl/t/rpl_mixed_drop_create_temp_table.test
@@ -1,5 +1,4 @@
-#Want to skip this test from daily Valgrind execution
---source include/no_valgrind_without_big.inc
+-- source include/big_test.inc
 ###################################################################################
 # This test cases evaluates the mixture of non-transactional and transcational
 # tables. Specifically when drop temporary tables and create temporary tables
diff --git a/mysql-test/t/ctype_cp932_binlog_stm.test b/mysql-test/t/ctype_cp932_binlog_stm.test
@@ -3,7 +3,7 @@
 
 -- source include/have_binlog_format_mixed_or_statement.inc
 -- source extra/binlog_tests/ctype_cp932_binlog.test
--- source include/no_valgrind_without_big.inc
+-- source include/big_test.inc
 
 
 call mtr.add_suppression('Error in Log_event::read_log_event()');
diff --git a/mysql-test/t/ctype_euckr.test b/mysql-test/t/ctype_euckr.test
@@ -1,6 +1,5 @@
 -- source include/have_euckr.inc
--- source include/no_valgrind_without_big.inc
-
+-- source include/big_test.inc
 
 #
 # Tests with the euckr character set
diff --git a/mysql-test/t/ctype_sjis.test b/mysql-test/t/ctype_sjis.test
@@ -1,6 +1,5 @@
 -- source include/have_sjis.inc
--- source include/no_valgrind_without_big.inc
-
+-- source include/big_test.inc
 
 #
 # Tests with the sjis character set
diff --git a/mysql-test/t/ctype_ujis.test b/mysql-test/t/ctype_ujis.test
@@ -1,6 +1,6 @@
 
 -- source include/have_ujis.inc
---source include/no_valgrind_without_big.inc
+-- source include/big_test.inc
 
 #
 # Tests with the ujis character set
diff --git a/mysql-test/t/greedy_optimizer.test b/mysql-test/t/greedy_optimizer.test
@@ -2,8 +2,7 @@
 #be ported to run with InnoDB,
 #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
-
+-- source include/big_test.inc
 #
 # A simple test of the greedy query optimization algorithm and the switches that
 # control the optimizationprocess.
diff --git a/mysql-test/t/innodb_explain_json_non_select_all.test b/mysql-test/t/innodb_explain_json_non_select_all.test
@@ -1,6 +1,4 @@
-#Want to skip this test from daily Valgrind execution
---source include/no_valgrind_without_big.inc
-
+-- source include/big_test.inc
 # 
 # Run explain_non_select.inc on InnoDB with all of the so-called 6.0 features.
 #
diff --git a/mysql-test/t/innodb_explain_json_non_select_none.test b/mysql-test/t/innodb_explain_json_non_select_none.test
@@ -1,5 +1,4 @@
-#Want to skip this test from daily Valgrind execution
---source include/no_valgrind_without_big.inc
+-- source include/big_test.inc
 # 
 # Run explain_non_select.inc on InnoDB without any of the socalled 6.0 features.
 #
diff --git a/mysql-test/t/innodb_explain_non_select_all.test b/mysql-test/t/innodb_explain_non_select_all.test
@@ -1,6 +1,4 @@
-#Want to skip this test from daily Valgrind execution
---source include/no_valgrind_without_big.inc
-
+-- source include/big_test.inc
 # 
 # Run explain_non_select.inc on InnoDB with all of the so-called 6.0 features.
 #
diff --git a/mysql-test/t/innodb_explain_non_select_none.test b/mysql-test/t/innodb_explain_non_select_none.test
@@ -1,5 +1,4 @@
-#Want to skip this test from daily Valgrind execution
---source include/no_valgrind_without_big.inc
+-- source include/big_test.inc
 # 
 # Run explain_non_select.inc on InnoDB without any of the socalled 6.0 features.
 #
diff --git a/mysql-test/t/ssl_connect.test b/mysql-test/t/ssl_connect.test
@@ -1,5 +1,5 @@
 -- source include/have_ssl_communication.inc
-
+-- source include/big_test.inc
 # Repeat connect/disconnect
 
 let $i=100;

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@`
`47`	`47`	`# ==== References ====`
`48`	`48`	`#`
`49`	`49`	`# Added in WL#3584 - Global Transaction Identifiers`
`50`		`---source include/no_valgrind_without_big.inc`
	`50`	`+-- source include/big_test.inc`
`51`	`51`	`--source include/not_windows.inc`
`52`	`52`	`--source include/not_gtid_enabled.inc`
`53`	`53`	`--disable_warnings`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`# * Various states of master and heartbeat`
`10`	`10`	`# * Circular replication`
`11`	`11`	`#`
`12`		`---source include/no_valgrind_without_big.inc`
	`12`	`+-- source include/big_test.inc`
`13`	`13`	`--source include/master-slave.inc`
`14`	`14`	`#`
`15`	`15`	`# The test runs long and does not have any specifics to`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`-- source include/have_euckr.inc`
`2`		`--- source include/no_valgrind_without_big.inc`
`3`		`-`
	`2`	`+-- source include/big_test.inc`
`4`	`3`
`5`	`4`	`#`
`6`	`5`	`# Tests with the euckr character set`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`-- source include/have_sjis.inc`
`2`		`--- source include/no_valgrind_without_big.inc`
`3`		`-`
	`2`	`+-- source include/big_test.inc`
`4`	`3`
`5`	`4`	`#`
`6`	`5`	`# Tests with the sjis character set`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`
`2`	`2`	`-- source include/have_ujis.inc`
`3`		`---source include/no_valgrind_without_big.inc`
	`3`	`+-- source include/big_test.inc`
`4`	`4`
`5`	`5`	`#`
`6`	`6`	`# Tests with the ujis character set`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`		`-#Want to skip this test from daily Valgrind execution`
`2`		`---source include/no_valgrind_without_big.inc`
`3`		`-`
	`1`	`+-- source include/big_test.inc`
`4`	`2`	`#`
`5`	`3`	`# Run explain_non_select.inc on InnoDB with all of the so-called 6.0 features.`
`6`	`4`	`#`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`		`-#Want to skip this test from daily Valgrind execution`
`2`		`---source include/no_valgrind_without_big.inc`
	`1`	`+-- source include/big_test.inc`
`3`	`2`	`#`
`4`	`3`	`# Run explain_non_select.inc on InnoDB without any of the socalled 6.0 features.`
`5`	`4`	`#`