From c9ef673785494c94f7b55c4bdb12437ae8533d8c Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Sun, 2 May 2021 22:03:26 +0200 Subject: [PATCH] Move the disabled tests lists to the standalone files per architecture families It will help the maintainers when trying to keep SPECs for different versions or product with minimal amount of differences --- community-mysql.spec | 90 +++++---------------------------- rh-skipped-tests-list-arm.list | 19 +++++++ rh-skipped-tests-list-base.list | 17 +++++++ rh-skipped-tests-list-ppc.list | 3 ++ rh-skipped-tests-list-s390.list | 27 ++++++++++ 5 files changed, 80 insertions(+), 76 deletions(-) create mode 100644 rh-skipped-tests-list-arm.list create mode 100644 rh-skipped-tests-list-base.list create mode 100644 rh-skipped-tests-list-ppc.list create mode 100644 rh-skipped-tests-list-s390.list diff --git a/community-mysql.spec b/community-mysql.spec index 00d26de..af5b78a 100644 --- a/community-mysql.spec +++ b/community-mysql.spec @@ -97,6 +97,11 @@ Source18: mysql@.service.in Source30: %{pkgnamepatch}.rpmlintrc # Configuration for server Source31: server.cnf.in +# Skipped tests lists +Source50: rh-skipped-tests-list-base.list +Source51: rh-skipped-tests-list-arm.list +Source52: rh-skipped-tests-list-s390.list +Source53: rh-skipped-tests-list-ppc.list # Comments for these patches are in the patch files # Patches common for more mysql-like packages @@ -385,92 +390,25 @@ pushd boost/boost_$(echo %{boost_bundled_version}| tr . _) %patch125 -p1 popd -# Modify tests to pass on all archs -pushd mysql-test -add_test () { - echo "$1" : BUG#0 "${@:2}" >> %{skiplist} -} -touch %{skiplist} +# generate a list of tests that fail, but are not disabled by upstream +cat %{SOURCE50} | tee -a mysql-test/%{skiplist} -# Fails on all arches -add_test main.subquery_sj_mat_bka_nobnl failing since 8.0.24 on F32+ -add_test main.derived_limit failing since 8.0.24 on F32+ -add_test main.explain_tree failing since 8.0.24 on F32+ - -add_test auth_sec.keyring_file_data_qa failing on F32+ -add_test innodb.alter_kill failing on F34+ - -# Fails when -DENABLED_LOCAL_INFILE=ON -add_test main.mysql_load_data_local_dir failing on F32+ - -# Unstable -add_test innodb.innodb_force_recovery unstable since 8.0.24 on F32+ -%ifarch x86_64 i686 -add_test clone.local_dml_auto_tune unstable on x86_64 and i686 -add_test perfschema.threads_mysql unstable on x86_64 and i686 -add-test rpl_gtid.rpl_multi_source_mtr_includes unstable on x86_64 and i686 +# disable some tests failing on different architectures +%ifarch %{arm} aarch64 +cat %{SOURCE51} | tee -a mysql-test/%{skiplist} %endif -# ppc64le -%ifarch ppc64le -add_test sys_vars.innodb_buffer_pool_size_basic fails only on ppc64le on f32+ +%ifarch s390 s390x +cat %{SOURCE52} | tee -a mysql-test/%{skiplist} %endif -# armv7hl -%ifarch armv7hl -add_test gis.st_latitude fails on F32+ -add_test gis.st_longitude fails on F32+ - -add_test perfschema.func_file_io missing hw on 32-bit arm -add_test perfschema.global_read_lock missing hw on 32-bit arm -add_test perfschema.relaylog missing hw on 32-bit arm -add_test perfschema.setup_objects missing hw on 32-bit arm - -add_test clone.remote_error_basic fails since 8.0.19 on F32+, max_allowed_packet is 0 - -add_test clone.remote_dml_auto_tune - -# Unstable -add_test clone.local_dml_auto_tune unstable on armv7hl -add_test innodb.innodb_bug-13628249 unstable on armv7hl -add_test main.grant_dynamic_flush unstable on armv7hl -add_test innodb.innodb_read_only +%ifarch ppc ppc64 ppc64p7 ppc64le +cat %{SOURCE53} | tee -a mysql-test/%{skiplist} %endif -# s390x -%ifarch s390x -# Fails since 8.0.21 -add_test x.resource_groups -# Fails since 8.0.22 -add_test main.subquery_bugs - -# Fails since F32 Mass Rebuild -add_test gis.geometry_class_attri_prop -add_test gis.geometry_property_function_issimple -add_test gis.gis_bugs_crashes -add_test gis.spatial_analysis_functions_buffer -add_test gis.spatial_analysis_functions_centroid -add_test gis.spatial_analysis_functions_distance -add_test gis.spatial_operators_intersection -add_test gis.spatial_operators_union -add_test gis.spatial_operators_symdifference -add_test gis.spatial_op_testingfunc_mix -add_test gis.spatial_utility_function_distance_sphere -add_test gis.spatial_utility_function_simplify - -add_test main.window_std_var -add_test main.window_std_var_optimized -add_test main.with_recursive - -# Unstable -add_test main.grant_dynamic_flush -%endif - -# mysql-test -popd cp %{SOURCE2} %{SOURCE3} %{SOURCE10} %{SOURCE11} %{SOURCE12} \ %{SOURCE14} %{SOURCE15} %{SOURCE17} %{SOURCE18} %{SOURCE31} scripts diff --git a/rh-skipped-tests-list-arm.list b/rh-skipped-tests-list-arm.list new file mode 100644 index 0000000..4f73b0d --- /dev/null +++ b/rh-skipped-tests-list-arm.list @@ -0,0 +1,19 @@ +gis.st_latitude : BUG#0 fails on F32+ +gis.st_longitude : BUG#0 fails on F32+ + +perfschema.func_file_io : BUG#0 missing hw on 32-bit arm +perfschema.global_read_lock : BUG#0 missing hw on 32-bit arm +perfschema.relaylog : BUG#0 missing hw on 32-bit arm +perfschema.setup_objects : BUG#0 missing hw on 32-bit arm + +clone.remote_error_basic : BUG#0 fails since 8.0.19 on F32+, max_allowed_packet is 0 + +clone.remote_dml_auto_tune : BUG#0 + +# Unstable +clone.local_dml_auto_tune : BUG#0 +innodb.innodb_bug-13628249 : BUG#0 +main.grant_dynamic_flush : BUG#0 +innodb.innodb_read_only : BUG#0 + +rpl_nogtid.rpl_mixed_mixing_engines : BUG#0 timeout after 1800 secs or armv7hl diff --git a/rh-skipped-tests-list-base.list b/rh-skipped-tests-list-base.list new file mode 100644 index 0000000..5b377c7 --- /dev/null +++ b/rh-skipped-tests-list-base.list @@ -0,0 +1,17 @@ +# Fails on all arches +main.subquery_sj_mat_bka_nobnl : BUG#0 failing since 8.0.24 on F32+ +main.derived_limit : BUG#0 failing since 8.0.24 on F32+ +main.explain_tree : BUG#0 failing since 8.0.24 on F32+ + +auth_sec.keyring_file_data_qa : BUG#0 failing on F32+ +innodb.alter_kill : BUG#0 failing on F34+ + +# Fails when -DENABLED_LOCAL_INFILE=ON +main.mysql_load_data_local_dir : BUG#0 failing on F32+ + +# Unstable +innodb.innodb_force_recovery : BUG#0 unstable since 8.0.24 on F32+ +clone.local_dml_auto_tune : BUG#0 unstable on x86_64 and i686 +perfschema.threads_mysql : BUG#0 unstable on x86_64 and i686 +rpl_gtid.rpl_multi_source_mtr_includes : BUG#0 unstable on x86_64 and i686 + diff --git a/rh-skipped-tests-list-ppc.list b/rh-skipped-tests-list-ppc.list new file mode 100644 index 0000000..d4da526 --- /dev/null +++ b/rh-skipped-tests-list-ppc.list @@ -0,0 +1,3 @@ +# ppc64le +sys_vars.innodb_buffer_pool_size_basic : BUG#0 fails only on ppc64le on f32+ + diff --git a/rh-skipped-tests-list-s390.list b/rh-skipped-tests-list-s390.list new file mode 100644 index 0000000..a936ed9 --- /dev/null +++ b/rh-skipped-tests-list-s390.list @@ -0,0 +1,27 @@ +# Fails since 8.0.21 +x.resource_groups : BUG#0 + +# Fails since 8.0.22 +main.subquery_bugs : BUG#0 + +# Fails since F32 Mass Rebuild +gis.geometry_class_attri_prop : BUG#0 +gis.geometry_property_function_issimple : BUG#0 +gis.gis_bugs_crashes : BUG#0 +gis.spatial_analysis_functions_buffer : BUG#0 +gis.spatial_analysis_functions_centroid : BUG#0 +gis.spatial_analysis_functions_distance : BUG#0 +gis.spatial_operators_intersection : BUG#0 +gis.spatial_operators_union : BUG#0 +gis.spatial_operators_symdifference : BUG#0 +gis.spatial_op_testingfunc_mix : BUG#0 +gis.spatial_utility_function_distance_sphere : BUG#0 +gis.spatial_utility_function_simplify : BUG#0 + +main.window_std_var : BUG#0 +main.window_std_var_optimized : BUG#0 +main.with_recursive : BUG#0 + +# Unstable +main.grant_dynamic_flush : BUG#0 +