Cleanup test data wrt bug 524158

(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 67C78E1D)

4 files changed, 16 insertions, 7 deletions

diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 84db05798a2d..22252f434f2f 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/mariadb
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/ChangeLog,v 1.53 2014/09/26 19:07:01 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/ChangeLog,v 1.54 2014/10/02 02:32:22 grknight Exp $
+
+  02 Oct 2014; Brian Evans <grknight@gentoo.org> mariadb-10.0.12.ebuild,
+  mariadb-10.0.14.ebuild, mariadb-5.5.39.ebuild:
+  Cleanup test data wrt bug 524158
 
 *mariadb-10.0.14 (26 Sep 2014)
 
diff --git a/dev-db/mariadb/mariadb-10.0.12.ebuild b/dev-db/mariadb/mariadb-10.0.12.ebuild
index 483abc308d58..97c92b9e2981 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: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-10.0.12.ebuild,v 1.4 2014/08/17 23:05:52 jer Exp $
+# $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 8fe9f868152c..52516801342d 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-5.5.39.ebuild b/dev-db/mariadb/mariadb-5.5.39.ebuild
index d463960cac93..45a6ecc7e1b9 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.7 2014/08/17 23:38:31 jer 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="20140817-2320Z"
@@ -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."