From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 23D35138334 for ; Thu, 18 Oct 2018 01:15:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 05678E085E; Thu, 18 Oct 2018 01:15:12 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CC086E085E for ; Thu, 18 Oct 2018 01:15:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3E4E3335CDA for ; Thu, 18 Oct 2018 01:15:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 924A343F for ; Thu, 18 Oct 2018 01:15:02 +0000 (UTC) From: "Brian Evans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" Message-ID: <1539825284.b60e51f25185a1a9a25044925133eef345e10573.grknight@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-apcu_bc/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.4.ebuild X-VCS-Directories: dev-php/pecl-apcu_bc/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: b60e51f25185a1a9a25044925133eef345e10573 X-VCS-Branch: master Date: Thu, 18 Oct 2018 01:15:02 +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: fb206b73-e059-44ac-a69d-853c0f74f088 X-Archives-Hash: 3fb358f207ae7b6944cb69017f9981f3 commit: b60e51f25185a1a9a25044925133eef345e10573 Author: Brian Evans gentoo org> AuthorDate: Thu Oct 18 01:14:44 2018 +0000 Commit: Brian Evans gentoo org> CommitDate: Thu Oct 18 01:14:44 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b60e51f2 dev-php/pecl-apcu_bc: Fix tests in 1.0.4 Closes: https://bugs.gentoo.org/667494 Signed-off-by: Brian Evans gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.4.ebuild | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.4.ebuild b/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.4.ebuild index 6cb699b96c7..30400a425c6 100644 --- a/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.4.ebuild +++ b/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,7 +12,7 @@ DOCS=( README.md ) USE_PHP="php7-0 php7-1 php7-2" -inherit php-ext-pecl-r3 +inherit php-ext-pecl-r3 multilib KEYWORDS="~amd64 ~x86" @@ -23,3 +23,22 @@ IUSE="" DEPEND="dev-php/pecl-apcu:7[php_targets_php7-0?,php_targets_php7-1?,php_targets_php7-2?]" RDEPEND="${DEPEND}" + +src_test() { + # This fixed version is necessary to have apcu load + # from the install before the tested apc. + # It is intentional to specify phpoptions twice. + # This mimics the Makefile. + local slot phpoptions + for slot in $(php_get_slots); do + php_init_slot_env "${slot}" + ln -s "${EXT_DIR}/apcu$(get_libname)" \ + "modules/" || die + phpoptions=( -n -d extension_dir="${PHP_EXT_S}/modules" + -d extension=apcu$(get_libname) + -d extension=apc$(get_libname) ) + NO_INTERACTION="yes" TEST_PHP_EXECUTABLE="${PHPCLI}" \ + "${PHPCLI}" "${phpoptions[@]}" \ + run-tests.php "${phpoptions[@]}" || die + done +}