[gentoo-commits] gentoo-x86 commit in dev-lang/php/files/eblits: src_test-v1.eblit

[Ole Markus With (olemarkus)]

olemarkus    12/02/06 13:53:17

  Modified:             src_test-v1.eblit
  Log:
  Fixed FEATURES="test", which apparently has not been working for a while.
  
  (Portage version: 2.1.10.41/cvs/Linux x86_64)

Revision  Changes    Path
1.3                  dev-lang/php/files/eblits/src_test-v1.eblit

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_test-v1.eblit?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_test-v1.eblit?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_test-v1.eblit?r1=1.2&r2=1.3

Index: src_test-v1.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_test-v1.eblit,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- src_test-v1.eblit	9 Aug 2010 10:47:57 -0000	1.2
+++ src_test-v1.eblit	6 Feb 2012 13:53:17 -0000	1.3
@@ -1,15 +1,15 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_test-v1.eblit,v 1.2 2010/08/09 10:47:57 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_test-v1.eblit,v 1.3 2012/02/06 13:53:17 olemarkus Exp $
 
 eblit-php-src_test() {
 	vecho ">>> Test phase [test]: ${CATEGORY}/${PF}"
-
-	if [[ ! -x "${WORKDIR}/sapis/cli/php" ]] ; then
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
 		ewarn "Test phase requires USE=cli, skipping"
 		return
 	else
-		export TEST_PHP_EXECUTABLE="${WORKDIR}/sapis/cli/php"
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
 	fi
 
 	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then