[gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/, eclass/

["Robin H. Johnson" <robbat2@gentoo.org>]

commit:     82b01b4996a8127ac0e35be646bb198a68129f9c
Author:     Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Thu Apr  5 15:58:43 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Apr  5 15:58:43 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=82b01b49

Testing changes
Added latin1 -> utf8 exceptions
Insert main test disabled to the correct location for both mysql and mariadb

---
 dev-db/mariadb/Manifest              |    2 +-
 dev-db/mariadb/mariadb-5.5.22.ebuild |   12 +++++++-----
 eclass/mysql-cmake.eclass            |    9 +++++++--
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 1df58ee..78f33cc 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -22,6 +22,6 @@ EBUILD mariadb-5.3.0_beta.ebuild 5889 RMD160 0c5c0076c8688fbd76a211621822c070795
 EBUILD mariadb-5.3.1_beta.ebuild 5889 RMD160 0c5c0076c8688fbd76a211621822c0707954856e SHA1 c277aebe22933ba0fe69b1afb85dc3083279d08e SHA256 1507806ef15e9444ce59355799c721c8f124c2e70a842bdefd2744e8060b3ac6
 EBUILD mariadb-5.3.3_rc.ebuild 5889 RMD160 88bb9385cec8fd77e86bf2152b515c6f160023ff SHA1 e3a71b5c909f9bcc6f9d01b4f9b887360904235b SHA256 454524f37fbb85d52d75167079c74d2abf1444e22fd4cbee654301cabcf3e971
 EBUILD mariadb-5.3.5.ebuild 6000 RMD160 b6c1c4b485967317db5bcaae207b8f6749d98835 SHA1 7f1629a9841bead95db0fe2d08775de2cc12ada4 SHA256 ff07e304ee3838b2ac5b2b0e4ec5e2792950ee51ace18979a4a96cbaf3cefca8
-EBUILD mariadb-5.5.22.ebuild 4185 RMD160 0e2318660c0bd819d3322d7603c5d0331d43690c SHA1 bdfce457bcdac9ca4f413c99da0207fac50e49e2 SHA256 6ea2028f635eb85cbcaea2861889a2c7cf9291f1a5fdcfc9535a7d5126716560
+EBUILD mariadb-5.5.22.ebuild 4386 RMD160 2a69e769526913afd4e2b6036e5e6b054b700f03 SHA1 38091be4d5a8f48f3e8d9f21a35403ecf51fbbda SHA256 c68aef90293410e66bbd3690e9138b34a8feeb16f48cb7606a047dd89053ad04
 MISC ChangeLog 4748 RMD160 fd1104bc4093238a078829d99f699f7cb7bf5592 SHA1 e1522463c7b327d50bf231bd78951669d89534f3 SHA256 af66e5983ec5f17648e82ebb8b50685a2b8ec7f1fa45d3db92ad29bad7dc5592
 MISC metadata.xml 1378 RMD160 50cdbdcabfafd504bed5cbfa5bf19466d5b762ca SHA1 bb93129383b64cfd888d313dc0dea6fa719a3367 SHA256 6736d49da017b0d2d5c6e77068ae66b57ce231c54a253eb8951dc5ad64a6258a

diff --git a/dev-db/mariadb/mariadb-5.5.22.ebuild b/dev-db/mariadb/mariadb-5.5.22.ebuild
index affe46f..96d53a5 100644
--- a/dev-db/mariadb/mariadb-5.5.22.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.22.ebuild
@@ -71,10 +71,11 @@ src_test() {
 		# false positives:
 		#
 		# main.information_schema, binlog.binlog_statement_insert_delayed,
-		# main.mysqld--help-notwin
+		# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
+		# funcs_1.is_columns_mysql
 		# fails due to USE=-latin1 / utf8 default
 		#
-		# main.mysql_client_test:
+		# main.mysql_client_test, main.mysql_client_test_nonblock:
 		# segfaults at random under Portage only, suspect resource limits.
 		#
 		# sys_vars.plugin_dir_basic
@@ -95,10 +96,11 @@ src_test() {
 		# fails because portage strips out the USER enviornment variable
 		#
 
-		for t in main.mysql_client_test \
+		for t in main.mysql_client_test main.mysql_client_test_nonblock \
 			binlog.binlog_statement_insert_delayed main.information_schema \
-			main.mysqld--help-notwin main.flush_read_lock_kill \
-			sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket ; do
+			main.mysqld--help main.flush_read_lock_kill \
+			sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \
+			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
 				mysql-v2_disable_test  "$t" "False positives in Gentoo"
 		done
 

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index d625eec..fb0ab11 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -33,9 +33,14 @@ mysql-cmake_disable_test() {
 
 	testsuite="${rawtestname/.*}"
 	testname="${rawtestname/*.}"
-	mysql_disable_file="${S}/mysql-test/t/disabled.def"
+	for mysql_disabled_file in \
+		${S}/mysql-test/disabled.def  \
+		${S}/mysql-test/t/disabled.def ; do
+		[ -f "${mysql_disabled_file}" ] && break
+	done
+	#mysql_disabled_file="${S}/mysql-test/t/disabled.def"
 	#einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}"
-	echo ${testname} : ${reason} >> "${mysql_disable_file}"
+	echo ${testname} : ${reason} >> "${mysql_disabled_file}"
 
 	if [ -n "${testsuite}" ] && [ "${testsuite}" != "main" ]; then
 		for mysql_disabled_file in \