From 2980890d18436846a8a73f7cd26ef1583e4e5e59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Hor=C3=A1k?= Date: Fri, 10 Jan 2014 09:40:00 +0100 Subject: [PATCH] Disable main.gis-precise test also for AArch64 Disable perfschema.func_file_io and perfschema.func_mutex for AArch64 (like it is done for 32-bit ARM) Resolves: #1050974 --- mariadb.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/mariadb.spec b/mariadb.spec index 46f075e..96f8a8a 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -7,7 +7,7 @@ Name: mariadb Version: 5.5.34 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 1 Summary: A community developed branch of MySQL @@ -276,11 +276,11 @@ rm -f mysql-test/t/ssl_8k_key-master.opt # generate a list of tests that fail, but are not disabled by upstream cat %{SOURCE14} > mysql-test/rh-skipped-tests.list # disable some tests failing on ARM architectures -%ifarch %{arm} +%ifarch %{arm} aarch64 cat %{SOURCE15} >> mysql-test/rh-skipped-tests.list %endif # disable some tests failing on ppc and s390 -%ifarch ppc ppc64 ppc64p7 s390 s390x +%ifarch ppc ppc64 ppc64p7 s390 s390x aarch64 echo "main.gis-precise : rhbz#906367" >> mysql-test/rh-skipped-tests.list %endif @@ -796,6 +796,11 @@ fi %{_mandir}/man1/mysql_client_test.1* %changelog +* Fri Jan 10 2014 Marcin Juszkiewicz 1:5.5.34-6 +- Disable main.gis-precise test also for AArch64 +- Disable perfschema.func_file_io and perfschema.func_mutex for AArch64 + (like it is done for 32-bit ARM) + * Fri Jan 10 2014 Honza Horak 1:5.5.34-5 - Clean all non-needed doc files properly