diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-29 08:28:15 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-29 08:28:15 +0300 |
commit | eeee1832d792ac296e1cebeeed1f7a7ce4ce4551 (patch) | |
tree | aa5ab1d088324767bef031422e9bf66c19a0e104 | |
parent | 642ddc313131622cc491026ea21953cf66a9e568 (diff) | |
download | mariadb-git-eeee1832d792ac296e1cebeeed1f7a7ce4ce4551.tar.gz |
Speed up buildbot by requiring --big-test for some slow tests
-rw-r--r-- | mysql-test/suite/innodb/include/innodb-page-compression.inc | 2 | ||||
-rw-r--r-- | mysql-test/suite/innodb/t/doublewrite.test | 2 | ||||
-rw-r--r-- | mysql-test/suite/innodb/t/innodb-alter-table.test | 2 | ||||
-rw-r--r-- | mysql-test/suite/innodb/t/innodb-change-buffer-recovery.test | 2 | ||||
-rw-r--r-- | mysql-test/suite/innodb/t/innodb-index-debug.test | 2 | ||||
-rw-r--r-- | mysql-test/suite/innodb/t/innodb-page_compression_zip.test | 2 | ||||
-rw-r--r-- | mysql-test/suite/innodb/t/log_file_size.test | 2 | ||||
-rw-r--r-- | mysql-test/suite/innodb/t/mdev-15707.test | 2 | ||||
-rw-r--r-- | mysql-test/suite/innodb/t/table_definition_cache_debug.test | 2 | ||||
-rw-r--r-- | mysql-test/suite/innodb/t/update_time.test | 2 | ||||
-rw-r--r-- | mysql-test/suite/mariabackup/mdev-14447.test | 2 | ||||
-rw-r--r-- | mysql-test/t/lowercase_table4.test | 2 | ||||
-rw-r--r-- | mysql-test/t/mysql_client_test.test | 2 | ||||
-rw-r--r-- | mysql-test/t/mysql_client_test_nonblock.test | 2 | ||||
-rw-r--r-- | mysql-test/t/mysqldump.test | 3 | ||||
-rw-r--r-- | mysql-test/t/selectivity_innodb.test | 2 |
16 files changed, 33 insertions, 0 deletions
diff --git a/mysql-test/suite/innodb/include/innodb-page-compression.inc b/mysql-test/suite/innodb/include/innodb-page-compression.inc index 3acbeaf0988..150d26e58cb 100644 --- a/mysql-test/suite/innodb/include/innodb-page-compression.inc +++ b/mysql-test/suite/innodb/include/innodb-page-compression.inc @@ -1,3 +1,5 @@ +# This test is slow on buildbot. +--source include/big_test.inc --disable_warnings set global innodb_file_format = `Barracuda`; set global innodb_file_per_table = on; diff --git a/mysql-test/suite/innodb/t/doublewrite.test b/mysql-test/suite/innodb/t/doublewrite.test index 3c87b108d6c..059a7f37ccf 100644 --- a/mysql-test/suite/innodb/t/doublewrite.test +++ b/mysql-test/suite/innodb/t/doublewrite.test @@ -7,6 +7,8 @@ --source include/innodb_page_size.inc --source include/have_debug.inc --source include/not_embedded.inc +# This test is slow on buildbot. +--source include/big_test.inc # Slow shutdown and restart to make sure ibuf merge is finished SET GLOBAL innodb_fast_shutdown = 0; diff --git a/mysql-test/suite/innodb/t/innodb-alter-table.test b/mysql-test/suite/innodb/t/innodb-alter-table.test index 0cf456ad146..ab0bd7b3353 100644 --- a/mysql-test/suite/innodb/t/innodb-alter-table.test +++ b/mysql-test/suite/innodb/t/innodb-alter-table.test @@ -1,5 +1,7 @@ --source include/innodb_page_size.inc --source include/have_partition.inc +# This test is slow on buildbot. +--source include/big_test.inc # # MMDEV-8386: MariaDB creates very big tmp file and hangs on xtradb diff --git a/mysql-test/suite/innodb/t/innodb-change-buffer-recovery.test b/mysql-test/suite/innodb/t/innodb-change-buffer-recovery.test index 6b52e386525..d8cc21c550c 100644 --- a/mysql-test/suite/innodb/t/innodb-change-buffer-recovery.test +++ b/mysql-test/suite/innodb/t/innodb-change-buffer-recovery.test @@ -9,6 +9,8 @@ --source include/not_embedded.inc # DBUG_SUICIDE() hangs under valgrind --source include/not_valgrind.inc +# This test is slow on buildbot. +--source include/big_test.inc CREATE TABLE t1( a INT AUTO_INCREMENT PRIMARY KEY, diff --git a/mysql-test/suite/innodb/t/innodb-index-debug.test b/mysql-test/suite/innodb/t/innodb-index-debug.test index adbde0c982f..64ca47ded13 100644 --- a/mysql-test/suite/innodb/t/innodb-index-debug.test +++ b/mysql-test/suite/innodb/t/innodb-index-debug.test @@ -2,6 +2,8 @@ -- source include/have_innodb.inc -- source include/count_sessions.inc -- source include/have_debug_sync.inc +# This test is slow on buildbot. +--source include/big_test.inc let $MYSQLD_DATADIR= `select @@datadir`; diff --git a/mysql-test/suite/innodb/t/innodb-page_compression_zip.test b/mysql-test/suite/innodb/t/innodb-page_compression_zip.test index 0c843314eee..89ec6f01db6 100644 --- a/mysql-test/suite/innodb/t/innodb-page_compression_zip.test +++ b/mysql-test/suite/innodb/t/innodb-page_compression_zip.test @@ -1,5 +1,7 @@ --source include/have_innodb.inc --source include/not_embedded.inc +# This test is slow on buildbot. +--source include/big_test.inc let $innodb_compression_algorithm_orig=`SELECT @@innodb_compression_algorithm`; diff --git a/mysql-test/suite/innodb/t/log_file_size.test b/mysql-test/suite/innodb/t/log_file_size.test index 1e6c7cd4d00..6f15b830e8d 100644 --- a/mysql-test/suite/innodb/t/log_file_size.test +++ b/mysql-test/suite/innodb/t/log_file_size.test @@ -4,6 +4,8 @@ --source include/not_embedded.inc # DBUG_EXECUTE_IF is needed --source include/have_debug.inc +# This test is slow on buildbot. +--source include/big_test.inc if (`SELECT @@innodb_log_file_size = 1048576`) { --skip Test requires innodb_log_file_size>1M. diff --git a/mysql-test/suite/innodb/t/mdev-15707.test b/mysql-test/suite/innodb/t/mdev-15707.test index 46e1ee7ce57..a0446ef4f81 100644 --- a/mysql-test/suite/innodb/t/mdev-15707.test +++ b/mysql-test/suite/innodb/t/mdev-15707.test @@ -1,4 +1,6 @@ --source include/windows.inc +# This test is slow on buildbot. +--source include/big_test.inc # Deadlock in conjunction with the innodb change buffering. diff --git a/mysql-test/suite/innodb/t/table_definition_cache_debug.test b/mysql-test/suite/innodb/t/table_definition_cache_debug.test index 1f3598d68c9..70467b53435 100644 --- a/mysql-test/suite/innodb/t/table_definition_cache_debug.test +++ b/mysql-test/suite/innodb/t/table_definition_cache_debug.test @@ -1,6 +1,8 @@ --source include/have_innodb.inc --source include/have_debug.inc --source include/have_debug_sync.inc +# This test is slow on buildbot. +--source include/big_test.inc call mtr.add_suppression("InnoDB: innodb_open_files=13 is exceeded"); diff --git a/mysql-test/suite/innodb/t/update_time.test b/mysql-test/suite/innodb/t/update_time.test index 1a00e3b9f73..a95c5171e9b 100644 --- a/mysql-test/suite/innodb/t/update_time.test +++ b/mysql-test/suite/innodb/t/update_time.test @@ -8,6 +8,8 @@ -- source include/have_innodb_max_16k.inc # restart does not work with embedded -- source include/not_embedded.inc +# This test is slow on buildbot. +--source include/big_test.inc CREATE TABLE t (a INT) ENGINE=INNODB; diff --git a/mysql-test/suite/mariabackup/mdev-14447.test b/mysql-test/suite/mariabackup/mdev-14447.test index 96d12368547..799d81a8710 100644 --- a/mysql-test/suite/mariabackup/mdev-14447.test +++ b/mysql-test/suite/mariabackup/mdev-14447.test @@ -1,4 +1,6 @@ --source include/have_debug.inc +# This test is slow on buildbot. +--source include/big_test.inc call mtr.add_suppression("InnoDB: New log files created"); let $basedir=$MYSQLTEST_VARDIR/tmp/backup; diff --git a/mysql-test/t/lowercase_table4.test b/mysql-test/t/lowercase_table4.test index 981c8a14564..24d2aa16f49 100644 --- a/mysql-test/t/lowercase_table4.test +++ b/mysql-test/t/lowercase_table4.test @@ -1,5 +1,7 @@ --source include/have_case_insensitive_file_system.inc --source include/have_innodb.inc +# This test is slow on buildbot. +--source include/big_test.inc --echo # --echo # Bug#46941 crash with lower_case_table_names=2 and diff --git a/mysql-test/t/mysql_client_test.test b/mysql-test/t/mysql_client_test.test index bf5331ca4f9..d486a93a79d 100644 --- a/mysql-test/t/mysql_client_test.test +++ b/mysql-test/t/mysql_client_test.test @@ -2,6 +2,8 @@ -- source include/not_embedded.inc # need to have the dynamic loading turned on for the client plugin tests --source include/have_plugin_auth.inc +# This test is slow on buildbot. +--source include/big_test.inc SET @old_general_log= @@global.general_log; SET @old_slow_query_log= @@global.slow_query_log; diff --git a/mysql-test/t/mysql_client_test_nonblock.test b/mysql-test/t/mysql_client_test_nonblock.test index 51263854e58..76126e15cee 100644 --- a/mysql-test/t/mysql_client_test_nonblock.test +++ b/mysql-test/t/mysql_client_test_nonblock.test @@ -2,6 +2,8 @@ # The non-blocking API is not supported in the embedded server. -- source include/not_embedded.inc +# This test is slow on buildbot. +--source include/big_test.inc SET @old_general_log= @@global.general_log; SET @old_slow_query_log= @@global.slow_query_log; diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test index 2af3bb18bcd..df939fd368f 100644 --- a/mysql-test/t/mysqldump.test +++ b/mysql-test/t/mysqldump.test @@ -17,6 +17,9 @@ let collation=utf8_unicode_ci; # There are tables in 'mysql' database of type innodb --source include/have_innodb.inc +# This test is slow on buildbot. +--source include/big_test.inc + disable_query_log; call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT"); enable_query_log; diff --git a/mysql-test/t/selectivity_innodb.test b/mysql-test/t/selectivity_innodb.test index e2dba034363..f407eb052fe 100644 --- a/mysql-test/t/selectivity_innodb.test +++ b/mysql-test/t/selectivity_innodb.test @@ -1,4 +1,6 @@ --source include/have_innodb.inc +# This test is slow on buildbot. +--source include/big_test.inc SET SESSION STORAGE_ENGINE='InnoDB'; |