Update test data locations wrt bug 524158

(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key 67C78E1D)

3 files changed, 11 insertions, 11 deletions

diff --git a/dev-db/mysql-cluster/ChangeLog b/dev-db/mysql-cluster/ChangeLog
index c667494930ee..545c642fb53a 100644
--- a/dev-db/mysql-cluster/ChangeLog
+++ b/dev-db/mysql-cluster/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/mysql-cluster
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-cluster/ChangeLog,v 1.4 2014/10/02 02:38:28 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-cluster/ChangeLog,v 1.5 2014/10/06 17:37:46 grknight Exp $
+
+  06 Oct 2014;  <grknight@gentoo.org> mysql-cluster-7.2.17.ebuild,
+  mysql-cluster-7.3.6-r1.ebuild:
+  Update test data locations wrt bug 524158
 
   02 Oct 2014; Brian Evans <grknight@gentoo.org> mysql-cluster-7.2.17.ebuild,
   mysql-cluster-7.3.6-r1.ebuild, mysql-cluster-7.3.6.ebuild:
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 e3176dc0ffd3..79d6d2cff18d 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 e803baa72053..b6e45550f8da 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."