[patch] mariadb-var-tests.patch

mariadb-var-tests.patch (text/plain), 2.55 KB, created by Jeroen Roovers (RETIRED) on 2014-10-05 11:14:28 UTC

Index: mariadb-10.0.14.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-10.0.14.ebuild,v
retrieving revision 1.2
diff -u -p -r1.2 mariadb-10.0.14.ebuild
--- mariadb-10.0.14.ebuild	2 Oct 2014 02:32:22 -0000	1.2
+++ mariadb-10.0.14.ebuild	5 Oct 2014 11:10:15 -0000
@@ -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"
@@ -107,9 +107,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."
Index: mariadb-5.5.39.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.39.ebuild,v
retrieving revision 1.8
diff -u -p -r1.8 mariadb-5.5.39.ebuild
--- mariadb-5.5.39.ebuild	2 Oct 2014 02:32:22 -0000	1.8
+++ mariadb-5.5.39.ebuild	5 Oct 2014 11:10:15 -0000
@@ -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"
@@ -106,9 +106,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."