Mask expected warnings about setrlimit in test suite

This commit is contained in:
Honza Horák 2013-03-04 14:09:47 +01:00
parent c05cc16158
commit e9b1460d6c
2 changed files with 17 additions and 4 deletions

11
mariadb-warning.patch Normal file
View File

@ -0,0 +1,11 @@
diff -up mariadb-5.5.29/mysql-test/mysql-test-run.pl.warning mariadb-5.5.29/mysql-test/mysql-test-run.pl
--- mariadb-5.5.29/mysql-test/mysql-test-run.pl.warning 2013-03-04 14:05:50.197960442 +0100
+++ mariadb-5.5.29/mysql-test/mysql-test-run.pl 2013-03-04 14:06:27.271959422 +0100
@@ -4745,6 +4745,7 @@ sub extract_warning_lines ($$) {
qr|Error: io_setup\(\) failed|,
qr|Warning: io_setup\(\) failed|,
qr|Warning: io_setup\(\) attempt|,
+ qr|setrlimit could not change the size of core files to 'infinity';|,
);
my $matched_lines= [];

View File

@ -1,6 +1,6 @@
Name: mariadb Name: mariadb
Version: 5.5.29 Version: 5.5.29
Release: 7%{?dist} Release: 8%{?dist}
Summary: A community developed branch of MySQL Summary: A community developed branch of MySQL
Group: Applications/Databases Group: Applications/Databases
@ -55,6 +55,7 @@ Patch13: mariadb-man-plugin.patch
Patch14: mariadb-buffer.patch Patch14: mariadb-buffer.patch
Patch15: mariadb-sortbuffer.patch Patch15: mariadb-sortbuffer.patch
Patch16: mariadb-basedir.patch Patch16: mariadb-basedir.patch
Patch17: mariadb-warning.patch
BuildRequires: perl, readline-devel, openssl-devel BuildRequires: perl, readline-devel, openssl-devel
BuildRequires: cmake, ncurses-devel, zlib-devel, libaio-devel BuildRequires: cmake, ncurses-devel, zlib-devel, libaio-devel
@ -291,6 +292,7 @@ MariaDB is a community developed branch of MySQL.
%patch14 -p1 %patch14 -p1
%patch15 -p1 %patch15 -p1
%patch16 -p1 %patch16 -p1
%patch17 -p1
# workaround for upstream bug #56342 # workaround for upstream bug #56342
rm -f mysql-test/t/ssl_8k_key-master.opt rm -f mysql-test/t/ssl_8k_key-master.opt
@ -405,9 +407,6 @@ done
cd mysql-test cd mysql-test
perl ./mysql-test-run.pl --force --retry=0 --ssl \ perl ./mysql-test-run.pl --force --retry=0 --ssl \
--skip-test-list=rh-skipped-tests.list \ --skip-test-list=rh-skipped-tests.list \
%ifarch ppc ppc64 ppc64p7
--nowarnings \
%endif
--suite-timeout=720 --testcase-timeout=30 --suite-timeout=720 --testcase-timeout=30
# cmake build scripts will install the var cruft if left alone :-( # cmake build scripts will install the var cruft if left alone :-(
rm -rf var rm -rf var
@ -789,6 +788,9 @@ fi
%{_mandir}/man1/mysql_client_test.1* %{_mandir}/man1/mysql_client_test.1*
%changelog %changelog
* Mon Mar 4 2013 Honza Horak <hhorak@redhat.com> 5.5.29-8
- Mask expected warnings about setrlimit in test suite
* Thu Feb 28 2013 Honza Horak <hhorak@redhat.com> 5.5.29-7 * Thu Feb 28 2013 Honza Horak <hhorak@redhat.com> 5.5.29-7
- Use configured prefix value instead of guessing basedir - Use configured prefix value instead of guessing basedir
in mysql_config in mysql_config