grknight 14/10/06 17:35:01
Modified: mysql-5.5.40.ebuild mysql-5.6.21.ebuild
mysql-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/mysql/mysql-5.5.40.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql/mysql-5.5.40.ebuild?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql/mysql-5.5.40.ebuild?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql/mysql-5.5.40.ebuild?r1=1.2&r2=1.3
Index: mysql-5.5.40.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.40.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mysql-5.5.40.ebuild 2 Oct 2014 02:25:50 -0000 1.2
+++ mysql-5.5.40.ebuild 6 Oct 2014 17:35:01 -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/mysql/mysql-5.5.40.ebuild,v 1.2
2014/10/02 02:25:50 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.40.ebuild,v 1.3
2014/10/06 17:35:01 grknight Exp $
EAPI="5"
@@ -69,7 +69,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}
# create symlink for the tests to find mysql_tzinfo_to_sql
ln -s "${CMAKE_BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
@@ -94,7 +94,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"
@@ -114,8 +114,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.3 dev-db/mysql/mysql-5.6.21.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql/mysql-5.6.21.ebuild?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql/mysql-5.6.21.ebuild?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql/mysql-5.6.21.ebuild?r1=1.2&r2=1.3
Index: mysql-5.6.21.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.21.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mysql-5.6.21.ebuild 2 Oct 2014 02:25:50 -0000 1.2
+++ mysql-5.6.21.ebuild 6 Oct 2014 17:35:01 -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/mysql/mysql-5.6.21.ebuild,v 1.2
2014/10/02 02:25:50 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.21.ebuild,v 1.3
2014/10/06 17:35:01 grknight Exp $
EAPI="5"
@@ -68,7 +68,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}
# create symlink for the tests to find mysql_tzinfo_to_sql
ln -s "${CMAKE_BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
@@ -113,7 +113,7 @@
ulimit -n 3000
# 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" \
--suite-timeout=5000
retstatus_tests=$?
[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
@@ -133,8 +133,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.12 dev-db/mysql/mysql-5.5.39.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql/mysql-5.5.39.ebuild?rev=1.12&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql/mysql-5.5.39.ebuild?rev=1.12&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql/mysql-5.5.39.ebuild?r1=1.11&r2=1.12
Index: mysql-5.5.39.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.39.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mysql-5.5.39.ebuild 2 Oct 2014 02:25:50 -0000 1.11
+++ mysql-5.5.39.ebuild 6 Oct 2014 17:35:01 -0000 1.12
@@ -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.11
2014/10/02 02:25:50 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.39.ebuild,v 1.12
2014/10/06 17:35:01 grknight Exp $
EAPI="5"
@@ -65,7 +65,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/"
@@ -108,7 +108,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"
@@ -128,8 +128,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.693 dev-db/mysql/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql/ChangeLog?rev=1.693&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql/ChangeLog?rev=1.693&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql/ChangeLog?r1=1.692&r2=1.693
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v
retrieving revision 1.692
retrieving revision 1.693
diff -u -r1.692 -r1.693
--- ChangeLog 2 Oct 2014 02:25:51 -0000 1.692
+++ ChangeLog 6 Oct 2014 17:35:01 -0000 1.693
@@ -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.692 2014/10/02
02:25:51 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.693 2014/10/06
17:35:01 grknight Exp $
+
+ 06 Oct 2014; <[email protected]> mysql-5.5.39.ebuild, mysql-5.5.40.ebuild,
+ mysql-5.6.21.ebuild:
+ Update test data locations wrt bug 524158
02 Oct 2014; Brian Evans <[email protected]> mysql-5.5.39.ebuild,
mysql-5.5.40.ebuild, mysql-5.6.20.ebuild, mysql-5.6.21.ebuild:
