From 159e5ae705747b2457d3cd7bfe016499cc5897a2 Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Mon, 22 Mar 2010 19:07:10 +0000 Subject: [PATCH] Bug #224751: Fix false positive fail of the profiling tests. Package-Manager: portage-2.2_rc63/cvs/Linux x86_64 --- dev-db/mariadb/ChangeLog | 5 ++++- dev-db/mariadb/mariadb-5.1.42.ebuild | 6 +++++- dev-db/mysql/ChangeLog | 7 ++++++- dev-db/mysql/mysql-5.1.39-r1.ebuild | 6 +++++- dev-db/mysql/mysql-5.1.44-r1.ebuild | 6 +++++- dev-db/mysql/mysql-5.1.44.ebuild | 6 +++++- dev-db/mysql/mysql-5.4.3_beta.ebuild | 6 +++++- dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild | 6 +++++- 8 files changed, 40 insertions(+), 8 deletions(-) diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog index 3b6d94aad2c2..cddf439b3f7f 100644 --- a/dev-db/mariadb/ChangeLog +++ b/dev-db/mariadb/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-db/mariadb # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/ChangeLog,v 1.2 2010/03/16 19:02:17 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/ChangeLog,v 1.3 2010/03/22 19:04:43 robbat2 Exp $ + + 22 Mar 2010; Robin H. Johnson mariadb-5.1.42.ebuild: + Bug #224751: Fix false positive fail of the profiling tests. 16 Mar 2010; Robin H. Johnson Manifest: Fix Manifest. diff --git a/dev-db/mariadb/mariadb-5.1.42.ebuild b/dev-db/mariadb/mariadb-5.1.42.ebuild index 41e30f3e8bf6..9022ec6108a8 100644 --- a/dev-db/mariadb/mariadb-5.1.42.ebuild +++ b/dev-db/mariadb/mariadb-5.1.42.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/mariadb/mariadb-5.1.42.ebuild,v 1.1 2010/03/15 18:47:37 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.1.42.ebuild,v 1.2 2010/03/22 19:04:43 robbat2 Exp $ MY_EXTRAS_VER="20100315-1843Z" EAPI=2 @@ -166,6 +166,10 @@ src_test() { mysql_disable_test $t "ndb not supported in mariadb" done fi + + use profiling && use community \ + || mysql_disable_test main.profiling \ + "Profiling test needs profiling support" # create directories because mysqladmin might make out of order mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log} diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog index 3d9df660dbfb..70305dff49ae 100644 --- a/dev-db/mysql/ChangeLog +++ b/dev-db/mysql/ChangeLog @@ -1,6 +1,11 @@ # 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.517 2010/03/12 18:50:33 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.518 2010/03/22 19:07:10 robbat2 Exp $ + + 22 Mar 2010; Robin H. Johnson mysql-5.1.39-r1.ebuild, + mysql-5.1.44.ebuild, mysql-5.1.44-r1.ebuild, mysql-5.4.3_beta.ebuild, + mysql-5.5.1_alpha_pre2.ebuild: + Bug #224751: Fix false positive fail of the profiling tests. 12 Mar 2010; Brent Baude mysql-5.0.83.ebuild: Marking mysql-5.0.83 ppc64 for bug 303747 diff --git a/dev-db/mysql/mysql-5.1.39-r1.ebuild b/dev-db/mysql/mysql-5.1.39-r1.ebuild index eb3a1cc9aa98..a663d1398795 100644 --- a/dev-db/mysql/mysql-5.1.39-r1.ebuild +++ b/dev-db/mysql/mysql-5.1.39-r1.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.1.39-r1.ebuild,v 1.3 2010/03/08 20:58:58 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.39-r1.ebuild,v 1.4 2010/03/22 19:07:10 robbat2 Exp $ MY_EXTRAS_VER="20100221-0021Z" EAPI=2 @@ -152,6 +152,10 @@ src_test() { ;; esac + use profiling && use community \ + || mysql_disable_test main.profiling \ + "Profiling test needs profiling support" + # create directories because mysqladmin might right out of order mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log} diff --git a/dev-db/mysql/mysql-5.1.44-r1.ebuild b/dev-db/mysql/mysql-5.1.44-r1.ebuild index 0687eaf13fbd..75f5b4fc9c6d 100644 --- a/dev-db/mysql/mysql-5.1.44-r1.ebuild +++ b/dev-db/mysql/mysql-5.1.44-r1.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.1.44-r1.ebuild,v 1.3 2010/03/08 20:58:58 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.44-r1.ebuild,v 1.4 2010/03/22 19:07:10 robbat2 Exp $ MY_EXTRAS_VER="20100227-1814Z" EAPI=2 @@ -155,6 +155,10 @@ src_test() { ;; esac + use profiling && use community \ + || mysql_disable_test main.profiling \ + "Profiling test needs profiling support" + # create directories because mysqladmin might right out of order mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log} diff --git a/dev-db/mysql/mysql-5.1.44.ebuild b/dev-db/mysql/mysql-5.1.44.ebuild index 07fb94257e50..0a10204dae20 100644 --- a/dev-db/mysql/mysql-5.1.44.ebuild +++ b/dev-db/mysql/mysql-5.1.44.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.1.44.ebuild,v 1.3 2010/03/08 20:58:58 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.44.ebuild,v 1.4 2010/03/22 19:07:10 robbat2 Exp $ MY_EXTRAS_VER="20100221-0021Z" EAPI=2 @@ -149,6 +149,10 @@ src_test() { ;; esac + use profiling && use community \ + || mysql_disable_test main.profiling \ + "Profiling test needs profiling support" + # create directories because mysqladmin might right out of order mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log} diff --git a/dev-db/mysql/mysql-5.4.3_beta.ebuild b/dev-db/mysql/mysql-5.4.3_beta.ebuild index 63b1b2454028..d079bf4725bd 100644 --- a/dev-db/mysql/mysql-5.4.3_beta.ebuild +++ b/dev-db/mysql/mysql-5.4.3_beta.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.4.3_beta.ebuild,v 1.4 2010/03/01 19:57:42 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.4.3_beta.ebuild,v 1.5 2010/03/22 19:07:10 robbat2 Exp $ MY_EXTRAS_VER="20100201-0104Z" EAPI=2 @@ -156,6 +156,10 @@ src_test() { ;; esac + use profiling && use community \ + || mysql_disable_test main.profiling \ + "Profiling test needs profiling support" + # create directories because mysqladmin might right out of order mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log} diff --git a/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild b/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild index 2fb4c940496c..3cf73ae488fe 100644 --- a/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild +++ b/dev-db/mysql/mysql-5.5.1_alpha_pre2.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.5.1_alpha_pre2.ebuild,v 1.4 2010/03/01 19:57:42 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.1_alpha_pre2.ebuild,v 1.5 2010/03/22 19:07:10 robbat2 Exp $ MY_EXTRAS_VER="20100201-0104Z" EAPI=2 @@ -160,6 +160,10 @@ src_test() { ;; esac + use profiling && use community \ + || mysql_disable_test main.profiling \ + "Profiling test needs profiling support" + # create directories because mysqladmin might right out of order mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log} -- 2.26.2