[gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass

[Robin H. Johnson (robbat2)]

robbat2     10/02/01 01:07:09

  Modified:             mysql.eclass
  Log:
  Fixup disabling tests for 5.1 and also gcc-version usage.

Revision  Changes    Path
1.127                eclass/mysql.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.127&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?rev=1.127&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mysql.eclass?r1=1.126&r2=1.127

Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.126
retrieving revision 1.127
diff -p -w -b -B -u -u -r1.126 -r1.127
--- mysql.eclass	31 Jan 2010 05:47:21 -0000	1.126
+++ mysql.eclass	1 Feb 2010 01:07:08 -0000	1.127
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.126 2010/01/31 05:47:21 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.127 2010/02/01 01:07:08 robbat2 Exp $
 
 # @ECLASS: mysql.eclass
 # @MAINTAINER:
@@ -18,7 +18,7 @@
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
 
-inherit eutils flag-o-matic gnuconfig autotools mysql_fx versionator
+inherit eutils flag-o-matic gnuconfig autotools mysql_fx versionator toolchain-funcs
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
@@ -209,11 +209,42 @@ mysql_version_is_at_least "5.1.26" \
 # @DESCRIPTION:
 # Helper function to disable specific tests.
 mysql_disable_test() {
-	local testname="${1}" ; shift
-	local reason="${@}"
-	local mysql_disable_file="${S}/mysql-test/t/disabled.def"
+	local rawtestname testname testsuite reason mysql_disable_file
+	rawtestname="${1}" ; shift
+	reason="${@}"
+	ewarn "test '${rawtestname}' disabled: '${reason}'"
+	
+	testsuite="${rawtestname/.*}"
+	testname="${rawtestname/*.}"
+	mysql_disable_file="${S}/mysql-test/t/disabled.def"
+	einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}"
 	echo ${testname} : ${reason} >> "${mysql_disable_file}"
-	ewarn "test '${testname}' disabled: '${reason}'"
+
+	# ${S}/mysql-tests/t/disabled.def
+	#
+	# ${S}/mysql-tests/suite/federated/disabled.def
+	#
+	# ${S}/mysql-tests/suite/jp/t/disabled.def
+	# ${S}/mysql-tests/suite/ndb/t/disabled.def
+	# ${S}/mysql-tests/suite/rpl/t/disabled.def
+	# ${S}/mysql-tests/suite/parts/t/disabled.def
+	# ${S}/mysql-tests/suite/rpl_ndb/t/disabled.def
+	# ${S}/mysql-tests/suite/ndb_team/t/disabled.def
+	# ${S}/mysql-tests/suite/binlog/t/disabled.def
+	# ${S}/mysql-tests/suite/innodb/t/disabled.def
+	if [ -n "${testsuite}" ]; then
+		for mysql_disable_file in \
+			${S}/mysql-test/suite/${testsuite}/disabled.def  \
+			${S}/mysql-test/suite/${testsuite}/t/disabled.def  \
+			FAILED ; do
+			[ -f "${mysql_disable_file}" ] && break
+		done
+		if [ "${mysql_disabled_file}" != "FAILED" ]; then
+			echo "${testname} : ${reason}" >> "${mysql_disable_file}"
+		else
+			ewarn "Could not find testsuite disabled.def location for ${rawtestname}"
+		fi
+	fi
 }
 
 # @FUNCTION: mysql_init_vars
@@ -555,7 +586,7 @@ mysql_pkg_setup() {
 
 	# Bug #290570 fun. Upstream made us need a fairly new GCC4.
 	if mysql_version_is_at_least "5.0.83" ; then
-		GCC_VER=$(gcc_version)
+		GCC_VER=$(gcc-version)
 		case ${GCC_VER} in
 			2*|3*|4.0|4.1|4.2) die "Active GCC too old! Must have at least GCC4.3" ;;
 		esac