diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2007-07-14 21:39:02 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2007-07-14 21:39:02 +0000 |
| commit | cabff386614ea54354bac145f869f80d671c0885 (patch) | |
| tree | aea7b9d1a751bde235222e786be269d6d230f7be /dev-db/mysql-community | |
| parent | version bump (diff) | |
| download | gentoo-2-cabff386614ea54354bac145f869f80d671c0885.tar.gz gentoo-2-cabff386614ea54354bac145f869f80d671c0885.tar.bz2 gentoo-2-cabff386614ea54354bac145f869f80d671c0885.zip | |
Clean up 5.0.27-r1 to match enterprise 5.0.26-r2 build process.
(Portage version: 2.1.3_rc5)
Diffstat (limited to 'dev-db/mysql-community')
| -rw-r--r-- | dev-db/mysql-community/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-db/mysql-community/mysql-community-5.0.27-r1.ebuild | 22 |
2 files changed, 16 insertions, 12 deletions
diff --git a/dev-db/mysql-community/ChangeLog b/dev-db/mysql-community/ChangeLog index f465d909e726..2aadd4c18d59 100644 --- a/dev-db/mysql-community/ChangeLog +++ b/dev-db/mysql-community/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-db/mysql-community # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-community/ChangeLog,v 1.13 2007/03/06 16:24:50 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-community/ChangeLog,v 1.14 2007/07/14 21:39:02 robbat2 Exp $ + + 14 Jul 2007; Robin H. Johnson <robbat2@gentoo.org> + mysql-community-5.0.27-r1.ebuild: + Clean up 5.0.27-r1 to match enterprise 5.0.26-r2 build process. 06 Mar 2007; Luca Longinotti <chtekk@gentoo.org> -mysql-community-5.1.15_alpha-r90.ebuild, diff --git a/dev-db/mysql-community/mysql-community-5.0.27-r1.ebuild b/dev-db/mysql-community/mysql-community-5.0.27-r1.ebuild index a1a872f97f7f..7306d4ccb00f 100644 --- a/dev-db/mysql-community/mysql-community-5.0.27-r1.ebuild +++ b/dev-db/mysql-community/mysql-community-5.0.27-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-community/mysql-community-5.0.27-r1.ebuild,v 1.2 2007/01/12 18:10:16 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-community/mysql-community-5.0.27-r1.ebuild,v 1.3 2007/07/14 21:39:02 robbat2 Exp $ MY_EXTRAS_VER="20070105" SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz" @@ -20,14 +20,14 @@ src_test() { addpredict /this-dir-does-not-exist/t9.MYI # mysqladmin start before dir creation - mkdir mysql-test/var{,/log} - - if [[ ${UID} -eq 0 ]] ; then - mysql_disable_test "im_daemon_life_cycle" "fail as root" - mysql_disable_test "im_life_cycle" "fail as root" - mysql_disable_test "im_options_set" "fail as root" - mysql_disable_test "im_options_unset" "fail as root" - mysql_disable_test "im_utils" "fail as root" + mkdir -p "${S}"/mysql-test/var{,/log} + + if ! hasq "userpriv" ${FEATURES} ; then + mysql_disable_test "im_daemon_life_cycle" "fails as root" + mysql_disable_test "im_life_cycle" "fails as root" + mysql_disable_test "im_options_set" "fails as root" + mysql_disable_test "im_options_unset" "fails as root" + mysql_disable_test "im_utils" "fails as root" fi for t in \ @@ -39,10 +39,10 @@ src_test() { ndb_{restore,subquery,transaction,trigger,truncate,types,update} \ ps_7ndb rpl_ndb_innodb_trans strict_autoinc_5ndb do - mysql_disable_test "${t}" "fail in sandbox" + mysql_disable_test "${t}" "fails with sandbox enabled" done - use "extraengine" && mysql_disable_test "federated" "fail with extraengine" + use "extraengine" && mysql_disable_test "federated" "fails with extraengine USE" make test-force-pl retstatus=$? |