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

[Davide Pesavento]

commit:     ef083e063c8adc2a2d06499a7642a64dc1635dfc
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sun Jul  1 23:32:30 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jul  1 23:32:30 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=ef083e06

[qt5-build.eclass] Finish src_test() implementation.

We have to use a custom testunner script that sets LD_LIBRARY_PATH
before executing the tests, otherwise ld.so won't find the correct
libraries.

Most tests should pass now. Yay!

---
 eclass/qt5-build.eclass |   31 +++++++++++++++++++++----------
 1 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index f69eed6..55e58bb 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -286,16 +286,27 @@ qt5-build_src_compile() {
 # Runs tests in target directories.
 qt5-build_src_test() {
 	# TODO: find a way to avoid a circular dep between qt-core and qt-test
-	# TODO: generate a custom TESTRUNNER script that setups LD_LIBRARY_PATH
-	if [[ ${PN} != "qt-core" ]]; then
-		tests() {
-			"${QT5_BUILD_DIR}"/bin/qmake \
-				"${S}/${subdir}/${subdir##*/}.pro" \
-				|| die "qmake failed"
-			emake check
-		}
-		qt5_foreach_target_subdir tests
-	fi
+	[[ ${PN} == "qt-core" ]] && return
+
+	# create a custom testrunner script that correctly sets
+	# {,DY}LD_LIBRARY_PATH before executing the given test
+	local testrunner=${QT5_BUILD_DIR}/gentoo-testrunner
+	cat <<-EOF > "${testrunner}"
+	#!/bin/sh
+	export LD_LIBRARY_PATH="${QT5_BUILD_DIR}/lib:${QTLIBDIR}"
+	export DYLD_LIBRARY_PATH="${QT5_BUILD_DIR}/lib:${QTLIBDIR}"
+	"\$@"
+	EOF
+	chmod +x "${testrunner}"
+
+	qmake() {
+		"${QT5_BUILD_DIR}"/bin/qmake \
+			"${S}/${subdir}/${subdir##*/}.pro" \
+			|| die "qmake failed"
+	}
+	qt5_foreach_target_subdir qmake
+	qt5_foreach_target_subdir emake
+	qt5_foreach_target_subdir emake TESTRUNNER="'${testrunner}'" check
 }
 
 # @FUNCTION: qt5-build_src_install