mysql-cmake-multilib: fallback mechanism for mysql-cmake-multilib_disable_test file locations

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>

1 files changed, 12 insertions, 7 deletions

diff --git a/eclass/mysql-cmake-multilib.eclass b/eclass/mysql-cmake-multilib.eclass
index 5e5533c..b3e8220 100644
--- a/eclass/mysql-cmake-multilib.eclass
+++ b/eclass/mysql-cmake-multilib.eclass
@@ -25,6 +25,8 @@ inherit cmake-multilib flag-o-matic multilib prefix
 mysql-cmake-multilib_disable_test() {
 	debug-print-function ${FUNCTION} "$@"
 
+	local bd="${BUILD_DIR:-${S}}"
+	pushd "${bd}" > /dev/null || die
 
 	local rawtestname testname testsuite reason mysql_disabled_file mysql_disabled_dir
 	rawtestname="${1}" ; shift
@@ -34,18 +36,19 @@ mysql-cmake-multilib_disable_test() {
 	testsuite="${rawtestname/.*}"
 	testname="${rawtestname/*.}"
 	for mysql_disabled_file in \
-		${S}/mysql-test/disabled.def  \
-		${S}/mysql-test/t/disabled.def ; do
+		${bd}/mysql-test/disabled.def  \
+		${bd}/mysql-test/t/disabled.def ; do
 		[[ -f ${mysql_disabled_file} ]] && break
 	done
-	#mysql_disabled_file="${S}/mysql-test/t/disabled.def"
+	#mysql_disabled_file="${bd}/mysql-test/t/disabled.def"
 	#einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}"
+	mkdir -p "${mysql_disabled_file%/*}" || die
 	echo ${testname} : ${reason} >> "${mysql_disabled_file}"
 
 	if [[ ( -n ${testsuite} ) && ( ${testsuite} != "main" ) ]]; then
 		for mysql_disabled_file in \
-			${S}/mysql-test/suite/${testsuite}/disabled.def  \
-			${S}/mysql-test/suite/${testsuite}/t/disabled.def  \
+			${bd}/mysql-test/suite/${testsuite}/disabled.def  \
+			${bd}/mysql-test/suite/${testsuite}/t/disabled.def  \
 			FAILED ; do
 			[[ -f ${mysql_disabled_file} ]] && break
 		done
@@ -53,8 +56,8 @@ mysql-cmake-multilib_disable_test() {
 			echo "${testname} : ${reason}" >> "${mysql_disabled_file}"
 		else
 			for mysql_disabled_dir in \
-				${S}/mysql-test/suite/${testsuite} \
-				${S}/mysql-test/suite/${testsuite}/t  \
+				${bd}/mysql-test/suite/${testsuite} \
+				${bd}/mysql-test/suite/${testsuite}/t  \
 				FAILED ; do
 				[[ -d ${mysql_disabled_dir} ]] && break
 			done
@@ -65,6 +68,8 @@ mysql-cmake-multilib_disable_test() {
 			fi
 		fi
 	fi
+
+	popd > /dev/null || die
 }
 
 # @FUNCTION: configure_cmake_locale