diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2010-03-08 21:01:53 +0000 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2010-03-08 21:01:53 +0000 |
commit | f1699390cea43d2a5ec43e1d493c62499426c478 (patch) | |
tree | 076bc91afb19f372cc0fe5a043a4f631a5a24a1d /dev-db | |
parent | Accidently disabling a test twice. (diff) | |
download | gentoo-2-f1699390cea43d2a5ec43e1d493c62499426c478.tar.gz gentoo-2-f1699390cea43d2a5ec43e1d493c62499426c478.tar.bz2 gentoo-2-f1699390cea43d2a5ec43e1d493c62499426c478.zip |
Backport more false positive disabling.
(Portage version: 2.2_rc63/cvs/Linux x86_64)
Diffstat (limited to 'dev-db')
-rw-r--r-- | dev-db/mysql/ChangeLog | 5 | ||||
-rw-r--r-- | dev-db/mysql/mysql-5.0.90-r2.ebuild | 20 |
2 files changed, 22 insertions, 3 deletions
diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog index 0224cd4e970e..408123947873 100644 --- a/dev-db/mysql/ChangeLog +++ b/dev-db/mysql/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-db/mysql # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.514 2010/03/08 20:58:58 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.515 2010/03/08 21:01:53 robbat2 Exp $ + + 08 Mar 2010; Robin H. Johnson <robbat2@gentoo.org> mysql-5.0.90-r2.ebuild: + Backport more false positive disabling. 08 Mar 2010; Robin H. Johnson <robbat2@gentoo.org> mysql-5.1.39-r1.ebuild, mysql-5.1.44.ebuild, mysql-5.1.44-r1.ebuild: diff --git a/dev-db/mysql/mysql-5.0.90-r2.ebuild b/dev-db/mysql/mysql-5.0.90-r2.ebuild index aabadcf1a836..2285ad855465 100644 --- a/dev-db/mysql/mysql-5.0.90-r2.ebuild +++ b/dev-db/mysql/mysql-5.0.90-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.90-r2.ebuild,v 1.3 2010/03/06 21:34:21 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.90-r2.ebuild,v 1.4 2010/03/08 21:01:53 robbat2 Exp $ MY_EXTRAS_VER="20100221-0021Z" EAPI=2 @@ -123,7 +123,7 @@ src_test() { # expired/invalid. case ${PV} in 5.0.*|5.1.*) - for t in openssl_1 rpl_openssl rpl_ssl ssl ssl_8k_key \ + for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \ ssl_compress ssl_connect ; do \ mysql_disable_test \ "$t" \ @@ -131,6 +131,22 @@ src_test() { done ;; esac + + # These are also failing in MySQL 5.0 for now, and are believed to be + # false positives: + # + # main.mysql_comment, main.mysql_upgrade: + # fails due to USE=-latin1 / utf8 default + # + # main.mysql_client_test: + # segfaults at random under Portage only, suspect resource limits. + case ${PV} in + 5.0.*) + for t in main.mysql_client_test main.mysql_comments main.mysql_upgrade; do + mysql_disable_test "$t" "False positives in Gentoo" + done + ;; + esac # create directories because mysqladmin might right out of order mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log} |