From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 408AA13877A for ; Mon, 25 Aug 2014 01:38:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9977BE09A8; Mon, 25 Aug 2014 01:38:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3FDDAE09A8 for ; Mon, 25 Aug 2014 01:38:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4267D34000E for ; Mon, 25 Aug 2014 01:38:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7371A3D66 for ; Mon, 25 Aug 2014 01:38:36 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1408930679.01887c6b3a0bb2740caf755a5d0db58ad07f63db.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt5-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 01887c6b3a0bb2740caf755a5d0db58ad07f63db X-VCS-Branch: master Date: Mon, 25 Aug 2014 01:38:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 00cf32a9-7982-49d1-8232-0275ccef6a34 X-Archives-Hash: 177c0ea78cb0acb4779f7e3c2b22ef5e commit: 01887c6b3a0bb2740caf755a5d0db58ad07f63db Author: Davide Pesavento gentoo org> AuthorDate: Mon Aug 25 01:37:59 2014 +0000 Commit: Davide Pesavento gentoo 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 }