Cleanup test data wrt bug 524158

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0x67C78E1D

6 files changed, 29 insertions, 17 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 4d3fe197b2dc..9ea4effdd26b 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/mysql
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.691 2014/09/24 03:20:19 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.692 2014/10/02 02:25:51 grknight Exp $
+
+  02 Oct 2014; Brian Evans <grknight@gentoo.org> mysql-5.5.39.ebuild,
+  mysql-5.5.40.ebuild, mysql-5.6.20.ebuild, mysql-5.6.21.ebuild:
+  Cleanup test data wrt bug 524158
 
 *mysql-5.6.21 (24 Sep 2014)
 
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index db275e5053a9..997fb92b6c50 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -16,21 +16,21 @@ DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256 71ff3d86e9e5691f3efe541bf31f55a7
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512 72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3 WHIRLPOOL a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf
 EBUILD mysql-5.1.70.ebuild 8874 SHA256 abd74f2cf58e5c8d4544c2dee89c8b30174b038aba91f3b45138cc299d8013b7 SHA512 303ee2ff791852dcab8d72a73e06b7f5e1fe0bd48b6e71730013c601eba412cebacb09cc76d06075f4e63b0eae80947a2bf9eb42da24d412b5c66d69d9aeb4c4 WHIRLPOOL 20d542a938589b3fefc738e64f5d9f9596faa1f1dad0175b144adc096d7354390eb6c4aed873dec9687e08483cba47fac56c786829c2ffbbb22e04ecea2b867a
 EBUILD mysql-5.1.73-r1.ebuild 8892 SHA256 a3f57db069a9d7eab793820178c0367ddeb912b604560db3a55553c9787cf230 SHA512 ebf6f4f196362b7623c6ee9b336e23ca94a67a32da4f389e4f49c9f44c1dc2b1c6e482de90e3afe1cfbf1edbcfbba02331ea4506cc5bc66fc2fed2624b9defd8 WHIRLPOOL c917e39875832571fdcdd5c37c58548c4bc25434b313b0dcbe569d0551b265ec3d2cf1811fbcbbac62213faa1de4855284769a2add53dc889e6998e76464e736
-EBUILD mysql-5.5.39.ebuild 4615 SHA256 f44dd9ebc5bfee7073fdef344903bb0fad67a411e52841506ea4c9ff515f45ad SHA512 a7fee9a6955b2f42d7206dc244b45e5b97dd3f936fdb664b0a55a38de1b221bfe998f30d23ebfa5445e839cf1026ee27fa0acde1c34b3d41be78963a00c35c0d WHIRLPOOL 6e57229545d685ed60a837d0c90e6706e8b7f28ba594479fea9e59a2c4d27a7ec1d7e6123d441563e7218872d9d571adc0e8857801e9f07ca77636c81e2f1794
-EBUILD mysql-5.5.40.ebuild 4099 SHA256 11c30d35f2992a341c9b8f6201a67e091a2c3fd18889a67ab6efa5034e6132a9 SHA512 80d63e3dbbbe9f9c848e1bf31bc11da3b2bf0a843d79d1f208d88f0ea8cacb07ed2fc55c9e4e0cf2711cf7f7d2cfe1f4e8253a070fe8b1d5731c40fdcd6fa3f0 WHIRLPOOL 04aca930b7dd00133f59ff8c967e785600570d12acc0bd3b00ce40663a7806eb3a21c6b5a0a49b507d48bcdcf549a75016844db5782021cd3530c8ab05e042ff
-EBUILD mysql-5.6.20.ebuild 4870 SHA256 3f648054cc738d223de0049f263040d9dd8fa0c57dba91059897cf8320686543 SHA512 841dde413652326c55c32581b4b94703f598e259e148b50767f2bff3c317650d757e4377c9e051e1ed324df01b6360916df9a84e1d39dd57a2d4e060baed55e1 WHIRLPOOL 88274cfd5530cc204304715e71b58503895655b6b201028d517cb89341a78fb3624c1b30cbf5db73ca18126ce1089db654c1950214416e4a397d34d3fabd41e6
-EBUILD mysql-5.6.21.ebuild 4860 SHA256 edd9335d4cebe22d0da7ca07daf672bdff3a2cbabdcfc7fcf77ff6cf3abb34ea SHA512 f895b00a30991e2b13a312ce96ae55e3e054617fa99b3917c34494a6741f5233d5c79e636b0f0e553360631370d9a553783912def022d91865db387bdbdc6d57 WHIRLPOOL 17772bc878305415d56ed05e468e06e92d4a921f7f0659e07b26fec10847c8f8a5ff148c5450ab9be644e3a13ad67b1dee5d87c5ab4c3beed903d88ea1f94484
-MISC ChangeLog 20022 SHA256 b9015af9c15a017b1e6ed09f9117265540d50a523db7fec2db8ce724cb4d8f04 SHA512 8a9c4849bdc8cf795fbafd31785a928221d44d0fbda484d014eca9cefc5f9467c5bde5d5656eb699002c00ad541f961b742e69d41f8018220a64494b7174a14d WHIRLPOOL 16b9dfd95537d10bdf5506cff7e94e75a0759bc002a5bd5f14b0b676081102e9b8849e9221bc51cdc9c2d4daf3d0cced3ea07fb12da22e387546529790a3fc70
+EBUILD mysql-5.5.39.ebuild 4712 SHA256 294c6428b85df0856c64ed1671241934c5bcca6cb0742d1fc38a2ae15bc4ba05 SHA512 c67e41490140b54d4460bd82fe443bd73020c6c221a703c08c4080181e132c617a35e52a47fe83b918215ef572ddb8d0e4f365c71fd4e4d8e37397452f05849c WHIRLPOOL 64ad25eec2c8b3b6183fbb1afebb4327c9ed244942b3d91abc9f00bc10d4550b6ee4c10bfea621476e3c4805da0e68f25af92699273c26b823084bc0c2a1e40f
+EBUILD mysql-5.5.40.ebuild 4194 SHA256 769e59cf9a49309152ed39663a3dfdb67e5e388ea94f8d682f5ef7a80598a1ef SHA512 30ecef63e2b3a37cf3c63e7876c6fc57b4eba8d44280e6a002b6ac8ed0ebd7f241050bef5e152f6ad5fb53beea6efc324f0f9fe5b75bc819039f8563370b93d2 WHIRLPOOL 1b53a82b91522bbc48bed309f189483ab79f14b68180afd0ed9ad23f458743a87f9f115d84ce759df50b88df99fcf4bbe82c3898efe7c7553d2c609b52c47ac6
+EBUILD mysql-5.6.20.ebuild 4966 SHA256 3899dac6c6db49d443f37fef2927e1122c39306549e7d4a19f2c5ffc78ed5e0e SHA512 fbe2aa9489ac2b01209785edd15e5e0ca1015a260a29721f65f3207ef8e2f67dd3cc31552e4dd0b1370db63dc42ead54363977a8597aa5dae17d3837ed891d68 WHIRLPOOL 926f210c2d90d8b4ad7a5b3f6d886bd6afe622e3a24fb77774a0be7b37d87bad31848a7138a2e7f2a895ebe44c5d9b1ca2acb354ecb3c996031c336e810375f4
+EBUILD mysql-5.6.21.ebuild 4955 SHA256 47fe668c772548e0471287bdbd799d34b0d9ca27959b428cb92ca14c00943b88 SHA512 538dfcfe28fe56d62ed5b916a64209e573bc760cf3f608877aefdf35e01257d097923aa5f5585ed75f1d1dc9b5337673c09e49663a0804502e1c388e6fd010de WHIRLPOOL d4aa2126d06e24b989dc977f2e5095e806b2932f4e67a7734bc3677c43e3182049841eeb658c7c78a77e2e08ad57d86631e4a42423e3aa63a270a49ce3b1477a
+MISC ChangeLog 20193 SHA256 ffb672b14fe346ba233089d973187c0084d913880837c46c6e036dc110046135 SHA512 42b7e813f83fc6d23e635352c1a03cc2c1d771d589e8cd1a517caae859f3446c6b08da42fb56f799fe1c7b13a3f2a2e8493de87e927ccba4d919313f36d87d37 WHIRLPOOL 3e7be8704731f0e26132cbe7c41d881769851d2e31189f47372b38603c08d440cc547cf0e0ac61c6846b8f0ffe11c525dd4781752549daddd00411584ed3f352
 MISC ChangeLog-2010 108404 SHA256 93dda53b8871d9040e6aebb59f095a8debd5c0a9437e78e5e949989e209ba5cd SHA512 5f54b7c2e25d27680a9313da2450851118e34a57202d9f36f59da52834ca3b587701d93868d71bf684ddc253d49f87837c8d7e2d442f2955dfde8a701150fbe5 WHIRLPOOL 55f758942e3012aa0ae7d529c2f8b6e0d8f4d7cbde09039f16cd05f0a58fc4e3e09ccd50e366effdcaab4641300eb0f494ddbe3a35a645ced8a9d747d80e9821
 MISC metadata.xml 1440 SHA256 57b1430c744bb21c4f99b885b92c1ca27efec6757e06f51bc043e25737a226b5 SHA512 0a8f4cc67b3dee66b95c16edcb0c1dd70b95b199f7cd46ba4b509a9f52dbb7d45ed2da4280ed8ba93d96521f66fc80d486de91f0a23ff3e0baee48795e5151fa WHIRLPOOL d747dccd7d8ae91fd60c5c074a3d1f0ab64a96f8ec09658a36e42546d17cbd9644de45527ed1bc6babeb7329c666ecc01cea7283dc4640268ed5cd2ca045172b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUIjh7AAoJEE4V4vFnx44dA+4IAJtalR/m7v5ds8t1/tuO4aOC
-sgksog9CrecHxpJ2cBJFcdQ/qrR9XZnqvj3kayVtBcpWfZ1ISYatmaS+0UaBa5i/
-4zhNmjyB+NsYPSjx+usBWM9JxVO5m4nqbMUh3DN9F/7tsYNYulas110Jml6IbcvW
-KDr1rh/othXRcJYRPFjc/ybf1dzYDTb72v5Y6Ce+C1EKcYK+RNhnc3ItZDCJxb8a
-TV9mCquxUtSUqFOuESU2Pzm3cUCa1fYAi5uNuF8Lk+u6B+vssKylm6MyEw+kH33L
-Q1AncaWUp6eRyJfLSkqfgBrca7vBZifLTkhtmxHTonGqlKB5rLupL/iVKT39DKU=
-=Lb28
+iQEcBAEBCAAGBQJULLe1AAoJEE4V4vFnx44dNv0IAIvyNQaLWxqIxiAkqIMLNclY
+uCGYmkUnKtvUF8RcHPFwiMaN4R+xHgctXdCFslCIpxMMpWw+vbblblA1ez7YWDPs
+nHNecR/dxFdWwi+ZIJUDms1yzCwaH8ZNzGTnDZ9lRCBcGwv9qQV5mJH3sqHk4200
+VrEqd+tnjcTGHCZ5+HumVsbF3QYThpiroRawA/0RbkwEfzLe88bNHzdG545UzcVs
+7HqFi77ZGPyc7b6P/Eg4nl1RlJS6GICOmBBuCwr/VZ1hjGDkWh46mf2+GRzxL/fu
+GLj54K6YHZqDkJh8kMEgnNldLIuAV9uQKraPOwZ3iwVE9MVdfqDo4vB6486Ubhc=
+=0GA4
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mysql/mysql-5.5.39.ebuild b/dev-db/mysql/mysql-5.5.39.ebuild
index 6044dd563bba..dad222000cb8 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 f31e03c0d67b..58289a934e1d 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.20.ebuild b/dev-db/mysql/mysql-5.6.20.ebuild
index fb27ea65bcd5..7dd5588d3d84 100644
--- a/dev-db/mysql/mysql-5.6.20.ebuild
+++ b/dev-db/mysql/mysql-5.6.20.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.20.ebuild,v 1.3 2014/08/03 21:01:05 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.20.ebuild,v 1.4 2014/10/02 02:25:50 grknight Exp $
 
 EAPI="5"
 
@@ -135,6 +135,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 a5b45fa1e1e0..0fc09a962132 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."