rpms/mariadb10.11
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rebuild with tests failing on different arches disabled (#1096787)

Browse Source
This commit is contained in:
Jakub Dorňák 2014-06-02 18:25:47 +02:00
parent e05ba09fe9
commit 7819f49078
6 changed files with 161 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
mariadb.spec
View File

@ -7,7 +7,7 @@
Name: mariadb
Version: 10.0.11
Release: 2%{?dist}
Release: 3%{?dist}
Epoch: 1
Summary: A community developed branch of MySQL
@ -51,7 +51,8 @@ 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
Source53: rh-skipped-tests-ppc64-s390x.list
Source54: rh-skipped-tests-s390.list
# Working around perl dependency checking bug in rpm FTTB. Remove later.
Source999: filter-requires-mysql.sh
@ -278,13 +279,27 @@ rm -f mysql-test/t/ssl_8k_key-master.opt
# generate a list of tests that fail, but are not disabled by upstream
cat %{SOURCE51} > mysql-test/rh-skipped-tests.list
# disable some tests failing on ARM architectures
%ifarch %{arm} aarch64
cat %{SOURCE52} >> mysql-test/rh-skipped-tests.list
%endif
%ifarch ppc ppc64 ppc64p7 s390 s390x
%ifarch aarch64
sed -i -r '/^connect.bin /d' mysql-test/rh-skipped-tests.list
%endif
%ifarch ppc ppc64 ppc64p7
cat %{SOURCE53} >> mysql-test/rh-skipped-tests.list
%endif
%ifarch s390x
cat %{SOURCE53} >> mysql-test/rh-skipped-tests.list
sed -i -r '/^vcol.vcol_supported_sql_funcs_/d' mysql-test/rh-skipped-tests.list
%endif
%ifarch s390
cat %{SOURCE54} >> 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
@ -403,10 +418,10 @@ done
--skip-test-list=rh-skipped-tests.list \
--suite-timeout=720 --testcase-timeout=30 \
--mysqld=--binlog-format=mixed --force-restart \
--shutdown-timeout=60
--shutdown-timeout=60 --max-test-fail=0
# cmake build scripts will install the var cruft if left alone :-(
rm -rf var
)
)
%endif
%install
@ -813,6 +828,9 @@ fi
%{_mandir}/man1/mysql_client_test.1*
%changelog
* Mon Jun 2 2014 Jakub Dorňák <jdornak@redhat.com> - 1:10.0.11-3
- rebuild with tests failing on different arches disabled (#1096787)
* Thu May 29 2014 Dan Horák <dan[at]danny.cz> - 1:10.0.11-2
- rebuild with tests failing on big endian arches disabled (#1096787)

8
rh-skipped-tests-arm.list
View File

@ -4,8 +4,10 @@
# This is caused by missing hardware performance counter support on ARM.
# Discussion about fixing that can be found in RH bug #741325.
perfschema.func_file_io : rhbz#773116 cycle counter does not work on arm
perfschema.func_mutex : rhbz#773116 cycle counter does not work on arm
#perfschema.func_file_io : rhbz#773116 cycle counter does not work on arm
#perfschema.func_mutex : rhbz#773116 cycle counter does not work on arm
connect.bin : Fails with MariaDB 10
connect.bin : Fails with MariaDB 10 (pass on aarch64)
perfschema.func_file_io : Fails with MariaDB 10
perfschema.func_mutex : Fails with MariaDB 10
perfschema.setup_objects : Fails with MariaDB 10

118
rh-skipped-tests-base.list
View File

@ -1,17 +1,117 @@
# Disable innodb.innodb, which is showing platform-dependent results
# as of 5.5.9. Upstream at http://bugs.mysql.com/bug.php?id=60155
#innodb.innodb : bug#60155 has platform-dependent results
innodb.innodb : bug#60155 has platform-dependent results
# Disable tokudb_innodb_xa_crash temporarily, until it is fixed:
#
#tokudb_innodb_xa_crash : https://bugzilla.redhat.com/show_bug.cgi?id=1018192
tokudb_innodb_xa_crash : https://bugzilla.redhat.com/show_bug.cgi?id=1018192
vcol.vcol_supported_sql_funcs_innodb : Fails with MariaDB 10
main.ssl_crl_clients : Fails with MariaDB 10
main.func_str : Fails with MariaDB 10
perfschema.nesting : Fails with MariaDB 10
perfschema.socket_summary_by_event_name_func : Fails with MariaDB 10
perfschema.socket_summary_by_instance_func : Fails with MariaDB 10
vcol.vcol_supported_sql_funcs_myisam : Fails with MariaDB 10
# These tests fail with MariaDB 10:
binlog.binlog_innodb : rhbz#1096787
binlog.binlog_mixed_cache_stat : rhbz#1096787
funcs_1.innodb_trig_03e : rhbz#1096787
funcs_1.innodb_views : rhbz#1096787
funcs_1.is_columns_innodb : rhbz#1096787
funcs_2.innodb_charset : rhbz#1096787
handler.innodb : rhbz#1096787
innodb_fts.fulltext_order_by : rhbz#1096787
innodb_fts.fulltext2 : 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.innodb-autoinc-optimize : rhbz#1096787
innodb.innodb_bug14704286 : rhbz#1096787
innodb.innodb_bug30423 : rhbz#1096787
innodb.innodb_bug30919 : 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-index : rhbz#1096787
innodb.innodb-index_ucs2 : rhbz#1096787
innodb.innodb_information_schema_buffer : rhbz#1096787
innodb.innodb_trx_weight : rhbz#1096787
innodb.innodb-wl5522 : rhbz#1096787
innodb.innodb-wl5522-zip : rhbz#1096787
innodb.innodb-wl5522-1 : rhbz#1096787
innodb_zip.innodb_bug56680 : rhbz#1096787
innodb_zip.innodb_cmp_drop_table : 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.commit_1innodb : rhbz#1096787
main.ctype_utf8 : rhbz#1096787
main.ctype_utf8mb4 : rhbz#1096787
main.ctype_utf8mb4_innodb : rhbz#1096787
main.flush-innodb : rhbz#1096787
main.func_str : rhbz#1096787
main.group_min_max_innodb : rhbz#1096787
main.implicit_commit : rhbz#1096787
main.index_intersect_innodb : rhbz#1096787
main.index_merge_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.innodb_mysql_lock2 : rhbz#1096787
main.multi_update : rhbz#1096787
main.mysqlcheck : rhbz#1096787
main.partition_exchange : rhbz#1096787
main.partition_innodb : rhbz#1096787
main.partition_innodb_plugin : rhbz#1096787
main.progress_976225 : rhbz#1096787
main.range_vs_index_merge_innodb : rhbz#1096787
main.selectivity_innodb : rhbz#1096787
main.sp_trans : rhbz#1096787
main.ssl_crl_clients : rhbz#1096787
main.statistics : rhbz#1096787
main.stat_tables_disabled : rhbz#1096787
main.stat_tables_innodb : 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
main.xtradb_mrr : 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_1_innodb : rhbz#1096787
parts.partition_exch_qa_10 : rhbz#1096787
percona.percona_xtradb_bug317074 : rhbz#1096787
perfschema.innodb_table_io : rhbz#1096787
perfschema.nesting : rhbz#1096787
perfschema.rpl_statements : rhbz#1096787
perfschema.socket_summary_by_event_name_func : rhbz#1096787
perfschema.socket_summary_by_instance_func : rhbz#1096787
rpl.rpl_circular_for_4_hosts : rhbz#1096787
rpl.rpl_checksum_cache : rhbz#1096787
rpl.rpl_innodb_bug30888 : rhbz#1096787
rpl.rpl_innodb_mixed_dml : rhbz#1096787
rpl.rpl_mixed_binlog_max_cache_size : rhbz#1096787
rpl.rpl_mixed_implicit_commit_binlog : rhbz#1096787
rpl.rpl_partition_innodb : rhbz#1096787
rpl.rpl_relayrotate : rhbz#1096787
rpl.rpl_relay_space_innodb : rhbz#1096787
spider/bg.function : rhbz#1096787
spider/bg.spider_fixes : rhbz#1096787
spider.function : rhbz#1096787
spider.spider_fixes : rhbz#1096787
sys_vars.innodb_max_dirty_pages_pct_func : rhbz#1096787
vcol.vcol_non_stored_columns_innodb : rhbz#1096787
vcol.vcol_supported_sql_funcs_innodb : rhbz#1096787 (pass on s390x)
vcol.vcol_supported_sql_funcs_myisam : rhbz#1096787 (pass on s390x)

16
rh-skipped-tests-ppc64-s390x.list Normal file
View File

@ -0,0 +1,16 @@
connect.alter : rhbz#1096787
connect.bin : rhbz#1096787
connect.dbf : rhbz#1096787
connect.index : rhbz#1096787
multi_source.skip_counter : rhbz#1096787
rpl.rpl_auto_increment : rhbz#1096787
rpl.rpl_gtid_basic : rhbz#1096787
rpl.rpl_gtid_master_promote : rhbz#1096787
rpl.rpl_gtid_stop_start : rhbz#1096787
rpl.rpl_gtid_until : rhbz#1096787
rpl.rpl_rotate_logs : rhbz#1096787
rpl.rpl_skip_replication : rhbz#1096787
rpl.rpl_slave_skip : rhbz#1096787
rpl.rpl_stm_max_relay_size : rhbz#1096787
sys_vars.max_relay_log_size_basic : rhbz#1096787
sys_vars.sql_slave_skip_counter_basic : rhbz#1096787

115
rh-skipped-tests-ppc64.list
View File

@ -1,115 +0,0 @@
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

8
rh-skipped-tests-s390.list Normal file
View File

@ -0,0 +1,8 @@
connect.alter : rhbz#1096787
connect.bin : rhbz#1096787
connect.dbf : rhbz#1096787
connect.index : rhbz#1096787
rpl.rpl_gtid_basic : rhbz#1096787
rpl.rpl_gtid_master_promote : rhbz#1096787
rpl.rpl_gtid_stop_start : rhbz#1096787
rpl.rpl_gtid_until : rhbz#1096787