Skip failing tests also on ppc64p7

This commit is contained in:
Honza Horák 2013-02-13 12:34:52 +01:00
parent dd2088fa6f
commit 7ef2ba1389

View File

@ -301,7 +301,7 @@ cat %{SOURCE14} > mysql-test/rh-skipped-tests.list
cat %{SOURCE15} >> mysql-test/rh-skipped-tests.list cat %{SOURCE15} >> mysql-test/rh-skipped-tests.list
%endif %endif
# disable some tests failing on ppc and s390 # disable some tests failing on ppc and s390
%ifarch ppc ppc64 s390 s390x %ifarch ppc ppc64 ppc64p7 s390 s390x
echo "main.gis-precise : rhbz#906367" >> mysql-test/rh-skipped-tests.list echo "main.gis-precise : rhbz#906367" >> mysql-test/rh-skipped-tests.list
%endif %endif
%ifarch ppc s390 %ifarch ppc s390
@ -380,7 +380,7 @@ done
%if %runselftest %if %runselftest
# hack to let 32- and 64-bit tests run concurrently on same build machine # hack to let 32- and 64-bit tests run concurrently on same build machine
case `uname -m` in case `uname -m` in
ppc64 | s390x | x86_64 | sparc64 ) ppc64 | ppc64p7 | s390x | x86_64 | sparc64 )
MTR_BUILD_THREAD=7 MTR_BUILD_THREAD=7
;; ;;
*) *)
@ -422,7 +422,7 @@ find $RPM_BUILD_ROOT -print | sed "s|^$RPM_BUILD_ROOT||" | sort > ROOTFILES
# multilib header hacks # multilib header hacks
# we only apply this to known Red Hat multilib arches, per bug #181335 # we only apply this to known Red Hat multilib arches, per bug #181335
case `uname -i` in case `uname -i` in
i386 | x86_64 | ppc | ppc64 | s390 | s390x | sparc | sparc64 ) i386 | x86_64 | ppc | ppc64 | ppc64p7 | s390 | s390x | sparc | sparc64 )
mv $RPM_BUILD_ROOT/usr/include/mysql/my_config.h $RPM_BUILD_ROOT/usr/include/mysql/my_config_`uname -i`.h mv $RPM_BUILD_ROOT/usr/include/mysql/my_config.h $RPM_BUILD_ROOT/usr/include/mysql/my_config_`uname -i`.h
install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/mysql/ install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/mysql/
;; ;;
@ -789,7 +789,7 @@ fi
%changelog %changelog
* Wed Feb 13 2013 Honza Horak <hhorak@redhat.com> 5.5.29-5 * Wed Feb 13 2013 Honza Horak <hhorak@redhat.com> 5.5.29-5
- Suppress warnings in tests also on ppc64p7 - Suppress warnings in tests and skip tests also on ppc64p7
* Tue Feb 12 2013 Honza Horak <hhorak@redhat.com> 5.5.29-4 * Tue Feb 12 2013 Honza Horak <hhorak@redhat.com> 5.5.29-4
- Suppress warning in tests on ppc - Suppress warning in tests on ppc