* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/, dev-db/mysql/, dev-db/mariadb-galera/, dev-db/percona-server/, ...
@ 2014-10-03 13:30 Brian Evans
0 siblings, 0 replies; only message in thread
From: Brian Evans @ 2014-10-03 13:30 UTC (permalink / raw
To: gentoo-commits
commit: 5c31dfeb9c12d412d544c7303e90593e9e46768e
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 3 13:28:22 2014 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Oct 3 13:28:22 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=5c31dfeb
Sync with tree for test changes
---
dev-db/mariadb-galera/mariadb-galera-10.0.12.ebuild | 4 +++-
dev-db/mariadb-galera/mariadb-galera-10.0.13.ebuild | 4 +++-
dev-db/mariadb/mariadb-10.0.12.ebuild | 4 +++-
dev-db/mariadb/mariadb-10.0.14.ebuild | 9 +++++----
dev-db/mariadb/mariadb-10.1.0_alpha.ebuild | 2 ++
dev-db/mariadb/mariadb-5.5.39.ebuild | 8 +++++---
dev-db/mariadb/mariadb-9999.ebuild | 2 ++
dev-db/mysql-cluster/mysql-cluster-7.2.17.ebuild | 6 ++++--
dev-db/mysql-cluster/mysql-cluster-7.3.6-r1.ebuild | 4 +++-
dev-db/mysql-cluster/mysql-cluster-7.3.6.ebuild | 6 ++++--
dev-db/mysql/mysql-5.5.39.ebuild | 4 +++-
dev-db/mysql/mysql-5.5.40.ebuild | 4 +++-
dev-db/mysql/mysql-5.6.21.ebuild | 4 +++-
dev-db/percona-server/percona-server-5.6.20.68.0.ebuild | 4 +++-
14 files changed, 46 insertions(+), 19 deletions(-)
diff --git a/dev-db/mariadb-galera/mariadb-galera-10.0.12.ebuild b/dev-db/mariadb-galera/mariadb-galera-10.0.12.ebuild
index d323bb0..69e1e8f 100644
--- a/dev-db/mariadb-galera/mariadb-galera-10.0.12.ebuild
+++ b/dev-db/mariadb-galera/mariadb-galera-10.0.12.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb-galera/mariadb-galera-10.0.12.ebuild,v 1.1 2014/07/30 06:26:21 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb-galera/mariadb-galera-10.0.12.ebuild,v 1.2 2014/10/02 02:33:56 grknight Exp $
EAPI="5"
MY_EXTRAS_VER="20140729-2200Z"
@@ -109,6 +109,8 @@ src_test() {
[[ -z "$failures" ]] || die "Test failures: $failures"
einfo "Tests successfully completed"
+ # Cleanup data files after tests
+ rm -r "${S}/mysql-test/var-tests" || die "Cleanup failed"
else
einfo "Skipping server tests due to minimal build."
diff --git a/dev-db/mariadb-galera/mariadb-galera-10.0.13.ebuild b/dev-db/mariadb-galera/mariadb-galera-10.0.13.ebuild
index bcc41bc..7ee77dc 100644
--- a/dev-db/mariadb-galera/mariadb-galera-10.0.13.ebuild
+++ b/dev-db/mariadb-galera/mariadb-galera-10.0.13.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb-galera/mariadb-galera-10.0.13.ebuild,v 1.1 2014/09/03 22:44:00 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb-galera/mariadb-galera-10.0.13.ebuild,v 1.2 2014/10/02 02:33:56 grknight Exp $
EAPI="5"
MY_EXTRAS_VER="20140903-1928Z"
@@ -117,6 +117,8 @@ multilib_src_test() {
[[ -z "$failures" ]] || die "Test failures: $failures"
einfo "Tests successfully completed"
+ # Cleanup data files after tests
+ rm -r "${S}/mysql-test/var-tests" || die "Cleanup failed"
else
einfo "Skipping server tests due to minimal build."
diff --git a/dev-db/mariadb/mariadb-10.0.12.ebuild b/dev-db/mariadb/mariadb-10.0.12.ebuild
index 6107125..97c92b9 100644
--- a/dev-db/mariadb/mariadb-10.0.12.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.12.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-10.0.12.ebuild,v 1.5 2014/10/02 02:32:22 grknight Exp $
EAPI="5"
MY_EXTRAS_VER="20140729-2200Z"
@@ -104,6 +104,8 @@ src_test() {
[[ -z "$failures" ]] || die "Test failures: $failures"
einfo "Tests successfully completed"
+ # Cleanup data files after tests
+ rm -r "${S}/mysql-test/var-tests" || die "Cleanup failed"
else
einfo "Skipping server tests due to minimal build."
diff --git a/dev-db/mariadb/mariadb-10.0.14.ebuild b/dev-db/mariadb/mariadb-10.0.14.ebuild
index 8fe9f86..5251680 100644
--- a/dev-db/mariadb/mariadb-10.0.14.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.14.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-10.0.14.ebuild,v 1.1 2014/09/26 19:07:01 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-10.0.14.ebuild,v 1.2 2014/10/02 02:32:22 grknight Exp $
EAPI="5"
MY_EXTRAS_VER="20140924-1913Z"
@@ -88,9 +88,8 @@ multilib_src_test() {
pushd "${TESTDIR}"
# run mysql-test tests
- # Skip all CONNECT engine tests until upstream respondes to how to reference data files
- perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" \
- --skip-test=connect
+ perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests"
+
retstatus_tests=$?
[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
@@ -109,6 +108,8 @@ multilib_src_test() {
[[ -z "$failures" ]] || die "Test failures: $failures"
einfo "Tests successfully completed"
+ # Cleanup data files after tests
+ rm -r "${S}/mysql-test/var-tests" || die "Cleanup failed"
else
einfo "Skipping server tests due to minimal build."
diff --git a/dev-db/mariadb/mariadb-10.1.0_alpha.ebuild b/dev-db/mariadb/mariadb-10.1.0_alpha.ebuild
index ad99d88..de30276 100644
--- a/dev-db/mariadb/mariadb-10.1.0_alpha.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.0_alpha.ebuild
@@ -102,6 +102,8 @@ multilib_src_test() {
[[ -z "$failures" ]] || die "Test failures: $failures"
einfo "Tests successfully completed"
+ # Cleanup test data after a successful run
+ rm -r "${S}/mysql-test/var-tests"
else
einfo "Skipping server tests due to minimal build."
diff --git a/dev-db/mariadb/mariadb-5.5.39.ebuild b/dev-db/mariadb/mariadb-5.5.39.ebuild
index 24aa609..45a6ecc 100644
--- a/dev-db/mariadb/mariadb-5.5.39.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.39.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.39.ebuild,v 1.1 2014/08/05 17:40:30 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.39.ebuild,v 1.8 2014/10/02 02:32:22 grknight Exp $
EAPI="5"
-MY_EXTRAS_VER="20140729-0112Z"
+MY_EXTRAS_VER="20140817-2320Z"
# Build system
BUILD="cmake"
@@ -13,7 +13,7 @@ inherit toolchain-funcs mysql-v2
IUSE="$IUSE"
# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
# When MY_EXTRAS is bumped, the index should be revised to exclude these.
EPATCH_EXCLUDE=''
@@ -107,6 +107,8 @@ src_test() {
[[ -z "$failures" ]] || die "Test failures: $failures"
einfo "Tests successfully completed"
+ # Cleanup data files after tests
+ rm -r "${S}/mysql-test/var-tests" || die "Cleanup failed"
else
einfo "Skipping server tests due to minimal build."
diff --git a/dev-db/mariadb/mariadb-9999.ebuild b/dev-db/mariadb/mariadb-9999.ebuild
index 0a47c74..252b2d7 100644
--- a/dev-db/mariadb/mariadb-9999.ebuild
+++ b/dev-db/mariadb/mariadb-9999.ebuild
@@ -109,6 +109,8 @@ multilib_src_test() {
[[ -z "$failures" ]] || die "Test failures: $failures"
einfo "Tests successfully completed"
+ # Cleanup test data after a successful run
+ rm -r "${S}/mysql-test/var-tests"
else
einfo "Skipping server tests due to minimal build."
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.2.17.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.2.17.ebuild
index e94ac90..e3176dc 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.2.17.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.2.17.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-cluster/mysql-cluster-7.2.17.ebuild,v 1.1 2014/08/03 21:42:35 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-cluster/mysql-cluster-7.2.17.ebuild,v 1.3 2014/10/02 02:38:28 grknight Exp $
EAPI=4
-MY_EXTRAS_VER="live"
+MY_EXTRAS_VER="none"
BUILD="cmake"
# PBXT
@@ -122,6 +122,8 @@ src_test() {
[[ -z "$failures" ]] || die "Test failures: $failures"
einfo "Tests successfully completed"
+ # Cleanup data files after tests
+ rm -r "${S}/mysql-test/var-tests" || die "Cleanup failed"
else
einfo "Skipping server tests due to minimal build."
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.3.6-r1.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.3.6-r1.ebuild
index 5b579f5..e803baa 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.3.6-r1.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.3.6-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-cluster/mysql-cluster-7.3.6-r1.ebuild,v 1.1 2014/08/31 20:59:52 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-cluster/mysql-cluster-7.3.6-r1.ebuild,v 1.2 2014/10/02 02:38:28 grknight Exp $
EAPI=5
MY_EXTRAS_VER="20140801-1950Z"
@@ -127,6 +127,8 @@ multilib_src_test() {
[[ -z "$failures" ]] || die "Test failures: $failures"
einfo "Tests successfully completed"
+ # Cleanup data files after tests
+ rm -r "${S}/mysql-test/var-tests" || die "Cleanup failed"
else
einfo "Skipping server tests due to minimal build."
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.3.6.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.3.6.ebuild
index faa725e..1eaba79 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.3.6.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.3.6.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-cluster/mysql-cluster-7.3.6.ebuild,v 1.1 2014/08/03 21:42:35 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-cluster/mysql-cluster-7.3.6.ebuild,v 1.3 2014/10/02 02:38:28 grknight Exp $
EAPI=4
-MY_EXTRAS_VER="live"
+MY_EXTRAS_VER="none"
BUILD="cmake"
# PBXT
@@ -129,6 +129,8 @@ src_test() {
[[ -z "$failures" ]] || die "Test failures: $failures"
einfo "Tests successfully completed"
+ # Cleanup data files after tests
+ rm -r "${S}/mysql-test/var-tests" || die "Cleanup failed"
else
einfo "Skipping server tests due to minimal build."
diff --git a/dev-db/mysql/mysql-5.5.39.ebuild b/dev-db/mysql/mysql-5.5.39.ebuild
index 6044dd5..dad2220 100644
--- a/dev-db/mysql/mysql-5.5.39.ebuild
+++ b/dev-db/mysql/mysql-5.5.39.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.39.ebuild,v 1.10 2014/08/13 15:26:18 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.39.ebuild,v 1.11 2014/10/02 02:25:50 grknight Exp $
EAPI="5"
@@ -128,6 +128,8 @@ src_test() {
[[ -z "$failures" ]] || die "Test failures: $failures"
einfo "Tests successfully completed"
+ # Cleanup data files after tests
+ rm -r "${S}/mysql-test/var-tests" || die "Cleanup failed"
else
einfo "Skipping server tests due to minimal build."
diff --git a/dev-db/mysql/mysql-5.5.40.ebuild b/dev-db/mysql/mysql-5.5.40.ebuild
index f31e03c..58289a9 100644
--- a/dev-db/mysql/mysql-5.5.40.ebuild
+++ b/dev-db/mysql/mysql-5.5.40.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.40.ebuild,v 1.1 2014/09/24 02:36:50 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.40.ebuild,v 1.2 2014/10/02 02:25:50 grknight Exp $
EAPI="5"
@@ -114,6 +114,8 @@ src_test() {
[[ -z "$failures" ]] || die "Test failures: $failures"
einfo "Tests successfully completed"
+ # Cleanup data files after tests
+ rm -r "${S}/mysql-test/var-tests" || die "Cleanup failed"
else
einfo "Skipping server tests due to minimal build."
diff --git a/dev-db/mysql/mysql-5.6.21.ebuild b/dev-db/mysql/mysql-5.6.21.ebuild
index a5b45fa..0fc09a9 100644
--- a/dev-db/mysql/mysql-5.6.21.ebuild
+++ b/dev-db/mysql/mysql-5.6.21.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.21.ebuild,v 1.1 2014/09/24 03:20:19 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.21.ebuild,v 1.2 2014/10/02 02:25:50 grknight Exp $
EAPI="5"
@@ -133,6 +133,8 @@ multilib_src_test() {
[[ -z "$failures" ]] || die "Test failures: $failures"
einfo "Tests successfully completed"
+ # Cleanup data files after tests
+ rm -r "${S}/mysql-test/var-tests" || die "Cleanup failed"
else
einfo "Skipping server tests due to minimal build."
diff --git a/dev-db/percona-server/percona-server-5.6.20.68.0.ebuild b/dev-db/percona-server/percona-server-5.6.20.68.0.ebuild
index c2f5f74..f5636de 100644
--- a/dev-db/percona-server/percona-server-5.6.20.68.0.ebuild
+++ b/dev-db/percona-server/percona-server-5.6.20.68.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/percona-server/percona-server-5.6.20.68.0.ebuild,v 1.1 2014/08/30 00:05:31 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/percona-server/percona-server-5.6.20.68.0.ebuild,v 1.2 2014/10/02 02:39:57 grknight Exp $
EAPI="5"
MY_EXTRAS_VER="20140817-2331Z"
@@ -123,6 +123,8 @@ multilib_src_test() {
[[ -z "$failures" ]] || die "Test failures: $failures"
einfo "Tests successfully completed"
+ # Cleanup data files after tests
+ rm -r "${S}/mysql-test/var-tests" || die "Cleanup failed"
else
einfo "Skipping server tests due to minimal build."
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2014-10-03 13:30 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-03 13:30 [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/, dev-db/mysql/, dev-db/mariadb-galera/, dev-db/percona-server/, Brian Evans
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox