[mariadb-galera/f21] updated lists of failing tests

[Honza Horak]

commit 5180c20e61d5037d56d916adff87a4ccff5c11bc
Author: Jakub Dorňák <jdornak at redhat.com>
Date:   Fri Feb 6 13:18:31 2015 +0100

    updated lists of failing tests
    
    Conflicts:
    	mariadb-galera.spec

 mariadb-galera.spec            | 25 +++++--------------------
 rh-skipped-tests-arm.list      |  1 -
 rh-skipped-tests-intel.list    |  1 -
 rh-skipped-tests-ppc-s390.list | 15 ---------------
 rh-skipped-tests-ppc64le.list  |  6 ------
 rh-skipped-tests-s390.list     |  2 --
 6 files changed, 5 insertions(+), 45 deletions(-)
---
diff --git a/mariadb-galera.spec b/mariadb-galera.spec
index b512d7b..6821895 100644
--- a/mariadb-galera.spec
+++ b/mariadb-galera.spec
@@ -145,11 +145,8 @@ Source17:         mysql-compat.service.in
 Source18:         mysql-compat.conf.in
 Source19:         mysql.init.in
 Source50:         rh-skipped-tests-base.list
-Source51:         rh-skipped-tests-intel.list
-Source52:         rh-skipped-tests-arm.list
-Source53:         rh-skipped-tests-ppc-s390.list
-Source54:         rh-skipped-tests-ppc64le.list
-Source55:         rh-skipped-tests-s390.list
+Source51:         rh-skipped-tests-arm.list
+Source52:         rh-skipped-tests-ppc-s390.list
 # TODO: clustercheck contains some hard-coded paths, these should be expanded using template system
 Source70:         clustercheck.sh
 Source71:         LICENSE.clustercheck
@@ -551,24 +548,12 @@ rm -f mysql-test/t/ssl_8k_key-master.opt
 cat %{SOURCE50} > mysql-test/rh-skipped-tests.list
 
 # disable some tests failing on different architectures
-%ifarch x86_64 i686
-cat %{SOURCE51} >> mysql-test/rh-skipped-tests.list
-%endif
-
 %ifarch %{arm} aarch64
-cat %{SOURCE52} >> mysql-test/rh-skipped-tests.list
+cat %{SOURCE51} | tee -a mysql-test/rh-skipped-tests.list
 %endif
 
 %ifarch ppc ppc64 ppc64p7 s390 s390x
-cat %{SOURCE53} >> mysql-test/rh-skipped-tests.list
-%endif
-
-%ifarch ppc64le
-cat %{SOURCE54} >> mysql-test/rh-skipped-tests.list
-%endif
-
-%ifarch s390
-cat %{SOURCE55} >> mysql-test/rh-skipped-tests.list
+cat %{SOURCE52} | tee -a mysql-test/rh-skipped-tests.list
 %endif
 
 cp %{SOURCE2} %{SOURCE3} %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} \
@@ -899,7 +884,6 @@ export MTR_BUILD_THREAD=%{__isa_bits}
 (
   cd mysql-test
   perl ./mysql-test-run.pl --force --retry=0 --ssl \
-    --skip-test-list=rh-skipped-tests.list \
     --suite-timeout=720 --testcase-timeout=30 \
     --mysqld=--binlog-format=mixed --force-restart \
     --shutdown-timeout=60 --max-test-fail=0
@@ -1253,6 +1237,7 @@ fi
 %changelog
 * Wed Mar 11 2015 Honza Horak <hhorak at redhat.com> - 1:10.0.17-1
 - Rebase to version 10.0.17
+- Rework disabled tests handling
 
 * Sat Jan 24 2015 Honza Horak <hhorak at redhat.com> - 1:10.0.15-1
 - Rebase to version 10.0.15
diff --git a/rh-skipped-tests-arm.list b/rh-skipped-tests-arm.list
index 061d0c5..ec4e52a 100644
--- a/rh-skipped-tests-arm.list
+++ b/rh-skipped-tests-arm.list
@@ -8,5 +8,4 @@ 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                                  : rhbz#1096787 (pass on aarch64)
-main.key_cache                               : rhbz#1096787 (pass on aarch64)
 perfschema.setup_objects                     : rhbz#1096787
diff --git a/rh-skipped-tests-ppc-s390.list b/rh-skipped-tests-ppc-s390.list
index c484996..c8fcfd2 100644
--- a/rh-skipped-tests-ppc-s390.list
+++ b/rh-skipped-tests-ppc-s390.list
@@ -7,18 +7,3 @@ connect.part_file                            : rhbz#1149647
 connect.part_table                           : rhbz#1149647
 connect.updelx                               : rhbz#1149647
 connect.updelx2                              : rhbz#1149647#c6
-main.gis-precise                             : rhbz#1096787
-main.statistics                              : 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_mixed_binlog_max_cache_size          : 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