From 655de675c8d97fa41de526b2b8f6b0cf7186f768 Mon Sep 17 00:00:00 2001 From: Honza Horak Date: Mon, 7 Aug 2017 18:03:29 +0200 Subject: [PATCH] Dividing test blacklists for s390 and ppc --- mariadb.spec | 12 ++++++++---- ...-tests-ppc-s390.list => rh-skipped-tests-ppc.list | 0 rh-skipped-tests-s390.list | 0 3 files changed, 8 insertions(+), 4 deletions(-) rename rh-skipped-tests-ppc-s390.list => rh-skipped-tests-ppc.list (100%) create mode 100644 rh-skipped-tests-s390.list diff --git a/mariadb.spec b/mariadb.spec index 831a414..5d62866 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -151,7 +151,8 @@ Source18: mysql@.service.in Source19: mysql.init.in Source50: rh-skipped-tests-base.list Source51: rh-skipped-tests-arm.list -Source52: rh-skipped-tests-ppc-s390.list +Source52: rh-skipped-tests-s390.list +Source53: rh-skipped-tests-ppc.list # Proposed upstream: https://jira.mariadb.org/browse/MDEV-12442 # General upstream response was slightly positive Source70: clustercheck.sh @@ -637,9 +638,12 @@ cat %{SOURCE50} | tee -a mysql-test/unstable-tests cat %{SOURCE51} | tee -a mysql-test/unstable-tests %endif -# TODO: divide ppc and s390 -%ifarch ppc ppc64 ppc64p7 s390 s390x -cat %{SOURCE51} | tee -a mysql-test/unstable-tests +%ifarch s390 s390x +cat %{SOURCE52} | tee -a mysql-test/unstable-tests +%endif + +%ifarch ppc ppc64 ppc64p7 ppc64le +cat %{SOURCE53} | tee -a mysql-test/unstable-tests %endif cp %{SOURCE2} %{SOURCE3} %{SOURCE10} %{SOURCE11} %{SOURCE12} \ diff --git a/rh-skipped-tests-ppc-s390.list b/rh-skipped-tests-ppc.list similarity index 100% rename from rh-skipped-tests-ppc-s390.list rename to rh-skipped-tests-ppc.list diff --git a/rh-skipped-tests-s390.list b/rh-skipped-tests-s390.list new file mode 100644 index 0000000..e69de29