[gentoo-commits] proj/qt:master commit in: eclass/

[Davide Pesavento]

commit:     01887c6b3a0bb2740caf755a5d0db58ad07f63db
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 25 01:37:59 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Aug 25 01:37:59 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=01887c6b

[qt5-build.eclass] Rename internal function.

---
 eclass/qt5-build.eclass | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index a4ae5af..4c81dea 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -217,6 +217,10 @@ qt5-build_src_compile() {
 qt5-build_src_test() {
 	echo ">>> Test phase [QtTest]: ${CATEGORY}/${PF}"
 
+	# '-after SUBDIRS-=cmake' disables broken tests - bug #474004
+	qt5_foreach_target_subdir qt5_qmake -after SUBDIRS-=cmake
+	qt5_foreach_target_subdir emake
+
 	# create a custom testrunner script that correctly sets
 	# {,DY}LD_LIBRARY_PATH before executing the given test
 	local testrunner=${QT5_BUILD_DIR}/gentoo-testrunner
@@ -228,18 +232,14 @@ qt5-build_src_test() {
 	EOF
 	chmod +x "${testrunner}"
 
-	# '-after SUBDIRS-=cmake' disables broken tests - bug #474004
-	qt5_foreach_target_subdir qt5_qmake -after SUBDIRS-=cmake
-	qt5_foreach_target_subdir emake
-
-	_test_runner() {
+	_qt5_test_runner() {
 		qt5_foreach_target_subdir emake TESTRUNNER="'${testrunner}'" check
 	}
 
 	if [[ ${VIRTUALX_REQUIRED} == test ]]; then
-		VIRTUALX_COMMAND="_test_runner" virtualmake
+		VIRTUALX_COMMAND="_qt5_test_runner" virtualmake
 	else
-		_test_runner
+		_qt5_test_runner
 	fi
 }