grknight 14/10/06 17:28:40
Modified: mariadb-10.0.14.ebuild mariadb-5.5.39.ebuild
ChangeLog
Log:
Update test data locations wrt bug 524158
(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with
key 67C78E1D)
Revision Changes Path
1.3 dev-db/mariadb/mariadb-10.0.14.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mariadb/mariadb-10.0.14.ebuild?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mariadb/mariadb-10.0.14.ebuild?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mariadb/mariadb-10.0.14.ebuild?r1=1.2&r2=1.3
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
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mariadb-10.0.14.ebuild 2 Oct 2014 02:32:22 -0000 1.2
+++ mariadb-10.0.14.ebuild 6 Oct 2014 17:28:40 -0000 1.3
@@ -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.2
2014/10/02 02:32:22 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-10.0.14.ebuild,v 1.3
2014/10/06 17:28:40 grknight Exp $
EAPI="5"
MY_EXTRAS_VER="20140924-1913Z"
@@ -61,7 +61,7 @@
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 @@
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"
@@ -108,8 +108,6 @@
[[ -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."
1.9 dev-db/mariadb/mariadb-5.5.39.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mariadb/mariadb-5.5.39.ebuild?rev=1.9&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mariadb/mariadb-5.5.39.ebuild?rev=1.9&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mariadb/mariadb-5.5.39.ebuild?r1=1.8&r2=1.9
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
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mariadb-5.5.39.ebuild 2 Oct 2014 02:32:22 -0000 1.8
+++ mariadb-5.5.39.ebuild 6 Oct 2014 17:28:40 -0000 1.9
@@ -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.8
2014/10/02 02:32:22 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.39.ebuild,v 1.9
2014/10/06 17:28:40 grknight Exp $
EAPI="5"
MY_EXTRAS_VER="20140817-2320Z"
@@ -59,7 +59,7 @@
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 @@
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"
@@ -107,8 +107,6 @@
[[ -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."
1.55 dev-db/mariadb/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mariadb/ChangeLog?rev=1.55&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mariadb/ChangeLog?rev=1.55&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mariadb/ChangeLog?r1=1.54&r2=1.55
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/mariadb/ChangeLog,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- ChangeLog 2 Oct 2014 02:32:22 -0000 1.54
+++ ChangeLog 6 Oct 2014 17:28:40 -0000 1.55
@@ -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.54 2014/10/02
02:32:22 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/ChangeLog,v 1.55 2014/10/06
17:28:40 grknight Exp $
+
+ 06 Oct 2014; <[email protected]> mariadb-10.0.14.ebuild,
+ mariadb-5.5.39.ebuild:
+ Update test data locations wrt bug 524158
02 Oct 2014; Brian Evans <[email protected]> mariadb-10.0.12.ebuild,
mariadb-10.0.14.ebuild, mariadb-5.5.39.ebuild:
