commit: 156737fee062a786004d236c9b20afc3082dab50
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 6 17:46:41 2014 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Oct 6 17:46:41 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=156737fe
Sync test changes from tree
---
dev-db/mariadb-galera/mariadb-galera-10.0.13.ebuild | 9 +++------
dev-db/mariadb/mariadb-10.0.14.ebuild | 8 +++-----
dev-db/mariadb/mariadb-5.5.39.ebuild | 8 +++-----
dev-db/mysql-cluster/mysql-cluster-7.2.17.ebuild | 8 +++-----
dev-db/mysql-cluster/mysql-cluster-7.3.6-r1.ebuild | 8 +++-----
dev-db/mysql/mysql-5.5.39.ebuild | 8 +++-----
dev-db/mysql/mysql-5.5.40.ebuild | 8 +++-----
dev-db/mysql/mysql-5.6.21.ebuild | 8 +++-----
dev-db/percona-server/percona-server-5.6.20.68.0.ebuild | 8 +++-----
9 files changed, 27 insertions(+), 46 deletions(-)
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 7ee77dc..d634c6a 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.2 2014/10/02 02:33:56 grknight Exp $
+# $Header:
/var/cvsroot/gentoo-x86/dev-db/mariadb-galera/mariadb-galera-10.0.13.ebuild,v
1.4 2014/10/06 17:44:30 grknight Exp $
EAPI="5"
MY_EXTRAS_VER="20140903-1928Z"
@@ -65,7 +65,7 @@ multilib_src_test() {
export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
# create directories because mysqladmin might right out of order
- mkdir -p "${S}"/mysql-test/var-tests{,/log}
+ mkdir -p "${T}"/var-tests{,/log}
# These are failing in MariaDB 10.0 for now and are believed to
be
# false positives:
@@ -97,7 +97,7 @@ multilib_src_test() {
# 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" \
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
--skip-test=connect
retstatus_tests=$?
[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
@@ -116,9 +116,6 @@ 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.14.ebuild
b/dev-db/mariadb/mariadb-10.0.14.ebuild
index 5251680..d336665 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.2
2014/10/02 02:32:22 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-10.0.14.ebuild,v 1.3
2014/10/06 17:28:40 grknight Exp $
EAPI="5"
MY_EXTRAS_VER="20140924-1913Z"
@@ -61,7 +61,7 @@ multilib_src_test() {
export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
# create directories because mysqladmin might right out of order
- mkdir -p "${S}"/mysql-test/var-tests{,/log}
+ mkdir -p "${T}"/var-tests{,/log}
# These are failing in MariaDB 10.0 for now and are believed to
be
# false positives:
@@ -88,7 +88,7 @@ multilib_src_test() {
pushd "${TESTDIR}"
# run mysql-test tests
- perl mysql-test-run.pl --force
--vardir="${S}/mysql-test/var-tests"
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests"
retstatus_tests=$?
[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
@@ -108,8 +108,6 @@ 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-5.5.39.ebuild
b/dev-db/mariadb/mariadb-5.5.39.ebuild
index 45a6ecc..951db81 100644
--- a/dev-db/mariadb/mariadb-5.5.39.ebuild
+++ b/dev-db/mariadb/mariadb-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/mariadb/mariadb-5.5.39.ebuild,v 1.8
2014/10/02 02:32:22 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.39.ebuild,v 1.9
2014/10/06 17:28:40 grknight Exp $
EAPI="5"
MY_EXTRAS_VER="20140817-2320Z"
@@ -59,7 +59,7 @@ src_test() {
export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
# create directories because mysqladmin might right out of order
- mkdir -p "${S}"/mysql-test/var-tests{,/log}
+ mkdir -p "${T}"/var-tests{,/log}
# create symlink for the tests to find mysql_tzinfo_to_sql
ln -s "${CMAKE_BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
@@ -87,7 +87,7 @@ src_test() {
pushd "${TESTDIR}"
# run mysql-test tests
- perl mysql-test-run.pl --force
--vardir="${S}/mysql-test/var-tests" \
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
--testcase-timeout=30
retstatus_tests=$?
[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
@@ -107,8 +107,6 @@ 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.2.17.ebuild
b/dev-db/mysql-cluster/mysql-cluster-7.2.17.ebuild
index e3176dc..79d6d2c 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.2.17.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.2.17.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.2.17.ebuild,v 1.3
2014/10/02 02:38:28 grknight Exp $
+# $Header:
/var/cvsroot/gentoo-x86/dev-db/mysql-cluster/mysql-cluster-7.2.17.ebuild,v 1.4
2014/10/06 17:37:46 grknight Exp $
EAPI=4
MY_EXTRAS_VER="none"
@@ -63,7 +63,7 @@ src_test() {
export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
# create directories because mysqladmin might right out of order
- mkdir -p "${S}"/mysql-test/var-tests{,/log}
+ mkdir -p "${T}"/var-tests{,/log}
# These are failing in MySQL 5.5 for now and are believed to be
# false positives:
@@ -102,7 +102,7 @@ src_test() {
pushd "${TESTDIR}"
# run mysql-test tests
- perl mysql-test-run.pl --force
--vardir="${S}/mysql-test/var-tests" \
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
--parallel=auto
retstatus_tests=$?
[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
@@ -122,8 +122,6 @@ 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 e803baa..b6e4555 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.2 2014/10/02 02:38:28 grknight Exp $
+# $Header:
/var/cvsroot/gentoo-x86/dev-db/mysql-cluster/mysql-cluster-7.3.6-r1.ebuild,v
1.3 2014/10/06 17:37:46 grknight Exp $
EAPI=5
MY_EXTRAS_VER="20140801-1950Z"
@@ -66,7 +66,7 @@ multilib_src_test() {
export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
# create directories because mysqladmin might right out of order
- mkdir -p "${S}"/mysql-test/var-tests{,/log}
+ mkdir -p "${T}"/var-tests{,/log}
# These are failing in MySQL 5.5/5.6 for now and are believed
to be
# false positives:
@@ -108,7 +108,7 @@ multilib_src_test() {
pushd "${TESTDIR}"
# run mysql-test tests
- perl mysql-test-run.pl --force
--vardir="${S}/mysql-test/var-tests"
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests"
retstatus_tests=$?
[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
has usersandbox $FEATURES && eerror "Some tests may fail with
FEATURES=usersandbox"
@@ -127,8 +127,6 @@ 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/mysql-5.5.39.ebuild b/dev-db/mysql/mysql-5.5.39.ebuild
index dad2220..0158c94 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.11
2014/10/02 02:25:50 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.39.ebuild,v 1.12
2014/10/06 17:35:01 grknight Exp $
EAPI="5"
@@ -65,7 +65,7 @@ src_test() {
export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
# create directories because mysqladmin might right out of order
- mkdir -p "${S}"/mysql-test/var-tests{,/log}
+ mkdir -p "${T}"/var-tests{,/log}
# create symlink for the tests to find mysql_tzinfo_to_sql
ln -s "${CMAKE_BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
@@ -108,7 +108,7 @@ src_test() {
pushd "${TESTDIR}"
# run mysql-test tests
- perl mysql-test-run.pl --force
--vardir="${S}/mysql-test/var-tests" \
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
--testcase-timeout=30
retstatus_tests=$?
[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
@@ -128,8 +128,6 @@ 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 58289a9..0abce41 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.2
2014/10/02 02:25:50 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.40.ebuild,v 1.3
2014/10/06 17:35:01 grknight Exp $
EAPI="5"
@@ -69,7 +69,7 @@ src_test() {
export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
# create directories because mysqladmin might right out of order
- mkdir -p "${S}"/mysql-test/var-tests{,/log}
+ mkdir -p "${T}"/var-tests{,/log}
# create symlink for the tests to find mysql_tzinfo_to_sql
ln -s "${CMAKE_BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
@@ -94,7 +94,7 @@ src_test() {
pushd "${TESTDIR}"
# run mysql-test tests
- perl mysql-test-run.pl --force
--vardir="${S}/mysql-test/var-tests" \
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
--testcase-timeout=30
retstatus_tests=$?
[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
@@ -114,8 +114,6 @@ 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 0fc09a9..8607c75 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.2
2014/10/02 02:25:50 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.21.ebuild,v 1.3
2014/10/06 17:35:01 grknight Exp $
EAPI="5"
@@ -68,7 +68,7 @@ multilib_src_test() {
export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
# create directories because mysqladmin might right out of order
- mkdir -p "${S}"/mysql-test/var-tests{,/log}
+ mkdir -p "${T}"/var-tests{,/log}
# create symlink for the tests to find mysql_tzinfo_to_sql
ln -s "${CMAKE_BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
@@ -113,7 +113,7 @@ multilib_src_test() {
ulimit -n 3000
# run mysql-test tests
- perl mysql-test-run.pl --force
--vardir="${S}/mysql-test/var-tests" \
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
--suite-timeout=5000
retstatus_tests=$?
[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
@@ -133,8 +133,6 @@ 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 f5636de..05e4e5c 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.2 2014/10/02 02:39:57 grknight Exp $
+# $Header:
/var/cvsroot/gentoo-x86/dev-db/percona-server/percona-server-5.6.20.68.0.ebuild,v
1.3 2014/10/06 17:40:34 grknight Exp $
EAPI="5"
MY_EXTRAS_VER="20140817-2331Z"
@@ -65,7 +65,7 @@ multilib_src_test() {
export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
# create directories because mysqladmin might right out of order
- mkdir -p "${S}"/mysql-test/var-tests{,/log}
+ mkdir -p "${T}"/var-tests{,/log}
# These are failing in Percona 5.6 for now and are believed to
be
# false positives:
@@ -103,7 +103,7 @@ multilib_src_test() {
ulimit -n 3000
# run mysql-test tests
- perl mysql-test-run.pl --force
--vardir="${S}/mysql-test/var-tests" \
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
--testcase-timeout=30
retstatus_tests=$?
[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
@@ -123,8 +123,6 @@ 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."
