diff --git a/mariadb-skip-test-list.patch b/mariadb-skip-test-list.patch new file mode 100644 index 0000000..79232bb --- /dev/null +++ b/mariadb-skip-test-list.patch @@ -0,0 +1,11 @@ +--- mariadb-10.0.11/mysql-test/lib/mtr_cases.pm.orig 2014-05-29 09:38:59.828057468 +0200 ++++ mariadb-10.0.11/mysql-test/lib/mtr_cases.pm 2014-05-29 09:39:26.890028880 +0200 +@@ -321,7 +321,7 @@ sub parse_disabled { + chomp; + next if /^\s*#/ or /^\s*$/; + mtr_error("Syntax error in $filename line $.") +- unless /^\s*(?:([-0-9A-Za-z_]+)\.)?([-0-9A-Za-z_]+)\s*:\s*(.*?)\s*$/; ++ unless /^\s*(?:([-0-9A-Za-z_\/]+)\.)?([-0-9A-Za-z_]+)\s*:\s*(.*?)\s*$/; + mtr_error("Wrong suite name in $filename line $.") + if defined $1 and defined $suitename and $1 ne $suitename; + $disabled{($1 || $suitename || '') . ".$2"} = $3; diff --git a/mariadb.spec b/mariadb.spec index 6b87552..6a810ba 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -51,6 +51,7 @@ Source15: mariadb-scripts-common Source16: mysqld.service Source51: rh-skipped-tests-base.list Source52: rh-skipped-tests-arm.list +Source53: rh-skipped-tests-ppc64.list # Working around perl dependency checking bug in rpm FTTB. Remove later. Source999: filter-requires-mysql.sh @@ -69,6 +70,7 @@ Patch11: mariadb-covscan-signexpr.patch Patch12: mariadb-covscan-stroverflow.patch Patch13: mariadb-config.patch Patch14: mariadb-ssltest.patch +Patch15: mariadb-skip-test-list.patch BuildRequires: perl, readline-devel, openssl-devel BuildRequires: cmake, ncurses-devel, zlib-devel, libaio-devel @@ -269,6 +271,7 @@ MariaDB is a community developed branch of MySQL. %patch12 -p1 %patch13 -p1 %patch14 -p1 +%patch15 -p1 # workaround for upstream bug #56342 rm -f mysql-test/t/ssl_8k_key-master.opt @@ -279,6 +282,9 @@ cat %{SOURCE51} > mysql-test/rh-skipped-tests.list %ifarch %{arm} aarch64 cat %{SOURCE52} >> mysql-test/rh-skipped-tests.list %endif +%ifarch ppc64 +cat %{SOURCE53} >> mysql-test/rh-skipped-tests.list +%endif # disable some tests failing on ppc and s390 %ifarch ppc ppc64 ppc64p7 s390 s390x aarch64 echo "main.gis-precise : rhbz#906367" >> mysql-test/rh-skipped-tests.list diff --git a/rh-skipped-tests-ppc64.list b/rh-skipped-tests-ppc64.list new file mode 100644 index 0000000..469b683 --- /dev/null +++ b/rh-skipped-tests-ppc64.list @@ -0,0 +1,115 @@ +multi_source.skip_counter : rhbz#1096787 +rpl.rpl_auto_increment : rhbz#1096787 +rpl.rpl_mixed_binlog_max_cache_size : rhbz#1096787 +rpl.rpl_slave_skip : rhbz#1096787 +rpl.rpl_innodb_mixed_dml : rhbz#1096787 +rpl.rpl_mixed_implicit_commit_binlog : rhbz#1096787 +rpl.rpl_gtid_until : rhbz#1096787 +rpl.rpl_skip_replication : rhbz#1096787 +rpl.rpl_partition_innodb : rhbz#1096787 +rpl.rpl_innodb_bug30888 : rhbz#1096787 +rpl.rpl_relayrotate : rhbz#1096787 +rpl.rpl_checksum_cache : rhbz#1096787 +rpl.rpl_relay_space_innodb : rhbz#1096787 +rpl.rpl_stm_max_relay_size : rhbz#1096787 +rpl.rpl_circular_for_4_hosts : rhbz#1096787 +rpl.rpl_gtid_basic : rhbz#1096787 +rpl.rpl_gtid_master_promote : rhbz#1096787 +rpl.rpl_gtid_stop_start : rhbz#1096787 +rpl.rpl_rotate_logs : rhbz#1096787 +connect.alter : rhbz#1096787 +connect.bin : rhbz#1096787 +connect.dbf : rhbz#1096787 +connect.index : rhbz#1096787 +spider/bg.spider_fixes : rhbz#1096787 +spider/bg.function : rhbz#1096787 +spider.spider_fixes : rhbz#1096787 +spider.function : rhbz#1096787 +innodb.innodb : rhbz#1096787 +binlog.binlog_mixed_cache_stat : rhbz#1096787 +main.ctype_utf8 : rhbz#1096787 +main.ctype_utf8mb4 : rhbz#1096787 +main.ctype_utf8mb4_innodb : rhbz#1096787 +main.implicit_commit : rhbz#1096787 +main.statistics : rhbz#1096787 +innodb_zip.innodb_cmp_drop_table : rhbz#1096787 +main.innodb_mysql_lock2 : rhbz#1096787 +binlog.binlog_innodb : rhbz#1096787 +main.commit_1innodb : rhbz#1096787 +main.sp_trans : rhbz#1096787 +innodb.innodb_bug30919 : rhbz#1096787 +main.partition_exchange : rhbz#1096787 +main.partition_innodb : rhbz#1096787 +main.partition_innodb_plugin : rhbz#1096787 +parts.partition_auto_increment_innodb : rhbz#1096787 +parts.partition_bit_innodb : rhbz#1096787 +parts.partition_engine_innodb : rhbz#1096787 +parts.partition_exch_qa_10 : rhbz#1096787 +parts.partition_exch_qa_1_innodb : rhbz#1096787 +innodb.innodb_information_schema_buffer : rhbz#1096787 +funcs_2.innodb_charset : rhbz#1096787 +main.selectivity_innodb : rhbz#1096787 +main.stat_tables_innodb : rhbz#1096787 +funcs_1.innodb_trig_03e : rhbz#1096787 +funcs_1.innodb_views : rhbz#1096787 +funcs_1.is_columns_innodb : rhbz#1096787 +handler.innodb : rhbz#1096787 +innodb.innodb-autoinc-optimize : rhbz#1096787 +innodb.innodb-index : rhbz#1096787 +innodb.innodb-index_ucs2 : rhbz#1096787 +innodb.innodb-wl5522 : rhbz#1096787 +innodb.innodb-wl5522-1 : rhbz#1096787 +innodb.innodb-wl5522-zip : rhbz#1096787 +innodb.innodb_bug14704286 : rhbz#1096787 +innodb.innodb_bug30423 : rhbz#1096787 +innodb.innodb_bug34300 : rhbz#1096787 +innodb.innodb_bug41904 : rhbz#1096787 +innodb.innodb_bug47621 : rhbz#1096787 +innodb.innodb_bug53290 : rhbz#1096787 +innodb.innodb_bug56143 : rhbz#1096787 +innodb.innodb_bug59733 : rhbz#1096787 +innodb.innodb_trx_weight : rhbz#1096787 +innodb_fts.fulltext2 : rhbz#1096787 +innodb_fts.fulltext_order_by : rhbz#1096787 +innodb_fts.innodb-fts-ddl : rhbz#1096787 +innodb_fts.innodb-fts-fic : rhbz#1096787 +innodb_fts.innodb_fts_large_records : rhbz#1096787 +innodb_fts.innodb_fts_misc : rhbz#1096787 +innodb_fts.innodb_fts_misc_1 : rhbz#1096787 +innodb_fts.innodb_fts_multiple_index : rhbz#1096787 +innodb_fts.innodb_fts_proximity : rhbz#1096787 +innodb_fts.innodb_fts_stopword_charset : rhbz#1096787 +innodb_fts.innodb_fts_transaction : rhbz#1096787 +innodb_zip.innodb_bug56680 : rhbz#1096787 +innodb_zip.innodb_index_large_prefix : rhbz#1096787 +innodb_zip.innodb_prefix_index_liftedlimit : rhbz#1096787 +main.alter_table : rhbz#1096787 +main.alter_table_online : rhbz#1096787 +main.flush-innodb : rhbz#1096787 +main.group_min_max_innodb : rhbz#1096787 +main.index_intersect_innodb : rhbz#1096787 +main.innodb_ext_key : rhbz#1096787 +main.innodb_icp : rhbz#1096787 +main.innodb_mrr_cpk : rhbz#1096787 +main.innodb_mysql_lock : rhbz#1096787 +main.mysqlcheck : rhbz#1096787 +main.range_vs_index_merge_innodb : rhbz#1096787 +main.stat_tables_disabled : rhbz#1096787 +main.subselect_innodb : rhbz#1096787 +main.subselect_sj2 : rhbz#1096787 +main.subselect_sj2_jcl6 : rhbz#1096787 +main.subselect_sj2_mat : rhbz#1096787 +main.trigger-trans : rhbz#1096787 +main.type_bit_innodb : rhbz#1096787 +main.update : rhbz#1096787 +perfschema.innodb_table_io : rhbz#1096787 +sys_vars.innodb_max_dirty_pages_pct_func : rhbz#1096787 +vcol.vcol_non_stored_columns_innodb : rhbz#1096787 +main.multi_update : rhbz#1096787 +main.index_merge_innodb : rhbz#1096787 +main.progress_976225 : rhbz#1096787 +main.xtradb_mrr : rhbz#1096787 +percona.percona_xtradb_bug317074 : rhbz#1096787 +sys_vars.max_relay_log_size_basic : rhbz#1096787 +sys_vars.sql_slave_skip_counter_basic : rhbz#1096787 +perfschema.rpl_statements : rhbz#1096787