Update test data locations wrt bug 524158

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0x67C78E1D

4 files changed, 21 insertions, 21 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/Manifest b/dev-db/mysql-cluster/Manifest
index 5146c3979483..340cea2675da 100644
--- a/dev-db/mysql-cluster/Manifest
+++ b/dev-db/mysql-cluster/Manifest
@@ -5,19 +5,19 @@ AUX my.cnf-5.5 4909 SHA256 56f5b341a0780a51d90bd51c72a917277606a6379e39a7f20c840
 DIST mysql-cluster-gpl-7.2.17.tar.gz 25882680 SHA256 d5bbf0fa7eda8056d01f564a9f50cba65794eefb07cb3c7b6b8819a86a66927b SHA512 ade82886867d897b23a6487c4efbbecef6842129a2b96df2a6097da73f4715e4e5ec4858f357d1e3f7eab5e1b4dc86bb89cd1ffe560ce17388ce26b06c5abd96 WHIRLPOOL cdf34ba72f971328a5ef10650df4a4ef482bfe6800543835fe5ea818f0fc8e8b57fda9c0608486fcada3590d84413c8e6c68db892ce1b36777c5bdce902e466b
 DIST mysql-cluster-gpl-7.3.6.tar.gz 42119293 SHA256 7f5405485ce05c88bd907269a75f161826ec92d763b46717a24880c378fd6dd4 SHA512 044a8854f61c7e4cb23343f84bf5c734244bbba8adc12a8a2c72d9febab4c1dbb404a7680aa0315de0df5459433eb578bc04f9ec169f0c2492e13e28aec6729d WHIRLPOOL 49b3eb455bad577d2a2d9d67c2fe78fef15ef184e7b56080d54f0a683f9a6596836108b727ed892a43dc0dc135ee65ab9293ddf0ad5f1587e41d31609090c8b6
 DIST mysql-extras-20140801-1950Z.tar.bz2 1494288 SHA256 a656486a7383d656ed33e279f41bb4384feba082cad3af48376ce9e1f395fe0b SHA512 b2c29c3d7c1ddacfa170125c9df0aaf65eac9f6112244b1deea97a46a3a2f2bd3eb069808e7b2ee3261d609b32046363830ba4ebcc7e74f449189a91145a6f9c WHIRLPOOL 41befc03a7382516849ecaecc1d02be7d00c47be489b97ce68c320c3aa8979c8f941525efe230d97ad2d1a85936a1e4d6c93d96a3f45930991a938e5f0fdab87
-EBUILD mysql-cluster-7.2.17.ebuild 4390 SHA256 96cee47ee8ff9d75fc5d6fae52fda22e93b74166d2fe74c7d4a562e9a7e84377 SHA512 16f66974c3bc8b6a467cbe9a92015801afe8a26d5e72b94708298446033c2df99952209004b5c08db7bf1325e1e8dd905f828196230d2475a16e033b20368ba6 WHIRLPOOL ff6a977dae4870cd24a432dca1b6e96914138fb769e2dfa7a41be29a982168fcdf39835bef83110dd7ee062e4ec4fab786ddbc03551932c3e8d1686b29d098eb
-EBUILD mysql-cluster-7.3.6-r1.ebuild 4746 SHA256 b3652cd4e41a420414dbf170c01776ef5e242b031881d32b728427031de2af15 SHA512 9455260d1b20c05da4b3de6d0b2766b88cf868d6fcbc4eecc8d97493f2d9f6d5d8a3dc91a6b3fa2474da48b3726ce00dfd40ee684a9c7fdc080554601e79fb33 WHIRLPOOL 80caaeb0dbfb985935faaa8818367260cbf450dd9a0e63d4ddd47125b4d5a485719499f58966e50aa47f2d776fff4f4e5f670b2470bea5ad6f00d7a2333d9114
+EBUILD mysql-cluster-7.2.17.ebuild 4273 SHA256 c7eef0014a9972dd9b456026398e2a5054161a8245f281df29cbadf0c8e8a580 SHA512 249ceab96ec28cb8a6f1b55c404ff1c93ed21956576d9037a8cdc8d48c58053cd0f4093b99490f5811cac061496f20f5ab896205b30b5006303185e12e51c79e WHIRLPOOL 3bd54a2c9c2d947d4bde6eb2f28f462362e35f077a79d545720d02819d61b53f9ab6d3eae62dbba03d1e8ba1e54a6d030c4c591812f86f300fc0c4a518b1e78c
+EBUILD mysql-cluster-7.3.6-r1.ebuild 4629 SHA256 74d7b0226268979a020e538564f4f031860c7317fa15a1e76b0796b27ed7d1f4 SHA512 d85bbb3915aa45bb2b30cbbe75f6727a1c237a4990a94c1bcab3f51e1726f63a95e400225c54948b8591fb04f9f3e05eb6b56caafe393c40162ba29a0cac4f37 WHIRLPOOL 81e93e50c52e64a7f6db0d388f68017beba9ff3b6c561f363a62246858de748b07f18c1d79f424b1b05530b4ad9c145d38204ea62515b98ffb15a5220ee46e53
 EBUILD mysql-cluster-7.3.6.ebuild 4672 SHA256 cd036b339eada1ecdecb99bc1abe9bc01ed9fbf218aedd6a51340e7a649ad619 SHA512 d6bdd49d7c73f4f09869b7e607c2c268508fee9d5bbac9655f98a972b5b902bf7874255136f7ca853cd098b3ed0969073d7c7748d6a6264c1b9630e7d9488b4c WHIRLPOOL 364dfe967031a2310618cafb7273c64fbf175327e5838f5697bac43584f889ab916a9d2874de78852a7a0f4dd79d2aaefa13d2671b57a53af19003a94c72ef39
-MISC ChangeLog 1178 SHA256 487aee58e25971220a403400d5b96e2d3a0145a57e12cf4d3f75b5aa787196b5 SHA512 4200d6417309a88364bd13f25b6b58c0ea81dcaf1daebdda8344cbc621953c9196db8476a757b97588a92070413c493970c5146109e7930d7fa33cc61ab15bf8 WHIRLPOOL 3da472dc963420a328ce611266cd53f4acad0565ac485e1f9ec7790d2d8c7d214189355345321ba2105ce40bdc5245434ac4e12107e49c071ee75a2d329d6b86
+MISC ChangeLog 1323 SHA256 0e4a78d0603cb040c7686beee11d622e3f3df9f176340d1fb57b036e3324f72f SHA512 13c670e3062ebb152de841779eba09a8532494ec06c01dcea200132451fecf232335e30eacceec17dbd4027d093dd989e429a2b57f317992b9ca790fc1208dbf WHIRLPOOL e834acf45f66dd7925a71547cf7548aff24bc1f2ddac906a277ece7187bc9af4a34c24dfe49b050ddb2cf26ec0686b9aa992ad71c383c2cfe8d1bc37eacc4c5d
 MISC metadata.xml 1075 SHA256 2e8f6b7bd966203f74776b642bd7d8007b89b3b1903d259a749088f9be6f333e SHA512 f5b5463c19d04ec24e6bb09decbfca589a0f26fb33a47f85854d54621d544963c662282980961fa58094d6078a8c0e387eb35066cb433a26cb3e8ea4365a2700 WHIRLPOOL 135e213130ff15bd48b97494afc14cbce3ce65b0da540be5d29e5260cbfdb8bab8cbb30dfa7749d244115588a2f1c3956ad5bbc818082926e34551a0922cd5f1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJULLqlAAoJEE4V4vFnx44doTAH/0NVDxSJIeqazmT2gmGL6f+P
-YxOVxi1unMQVNgZvM6npKWcK+b33JE5PBE7Y2zNj0o2faNw5sN2eSkul56nsnxD8
-ACa2HGS/Jrdca0p5LreWhtQzR6I8yP5ydHTZkdEt8rMbs0kpywL67OV9gtSkwKce
-0TAZQyO4DUC8U88/GL5Zm/sC1BWWYplSFrFbFksFGmxmc1baM8/3UVhW2lhCWZvA
-v/K6W5mN36HdwdW5VkdLpXtADCUrcy0ikwX3twSR87wPTGTAUdO+Hi8FX4E0rgo/
-mJ9jOktieEPaJmWYj4D88lIVl4ApScsdAj2bvjW9I8FtSBRNJaZMv0uuJoUdvrY=
-=4dQg
+iQEcBAEBCAAGBQJUMtNrAAoJEE4V4vFnx44dqoEIAIOkTrtG2ujVCfdpkU22JIHV
+LDF2Z+RR/U+PkeNJgN2RfVasVLuzNec0M8uRU03mW97rkUQA2W+QJDtPVf+/T+yx
++4I/rkxHfu1eAkZCXj0IpiX9rnP7cxW+wgGgCRKfNdhee7ZaWf3tyW4FdWaF0ZE6
+rM4QBtSdhp06BS6/BLYN4hywpcc9yteN+dhSn3y6EfqnTqycs2vWavPe2Oq72OKJ
+QTQnb+EKbQGDTlQ/WUl7RDWfs4hkvVm1oERHRqN9Rqc48pCeji5sSPvsFNSTpJ0+
+occgXOJUsA+5XZfM1QDQUS4MG5YX0l41+sdems+EmIzi6gRWupK9wVv2Vrkzg54=
+=eImF
 -----END PGP SIGNATURE-----
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."