diff options
| author |   Matti Bickel <mabi@gentoo.org> | 2010-08-09 10:47:58 +0000 |
|---|---|---|
| committer | Matti Bickel <mabi@gentoo.org> | 2010-08-09 10:47:58 +0000 |
| commit | b4c277acb92bfb5a1c49e0c4b0ce34c36f47c289 (patch) | |
| tree | 29fa049ee1dfc20ed022efc5aadf96278b1a4d11 /dev-lang/php | |
| parent | remove old ebuilds - RESTRICT=test (#315725) (diff) | |
| download | gentoo-2-b4c277acb92bfb5a1c49e0c4b0ce34c36f47c289.tar.gz gentoo-2-b4c277acb92bfb5a1c49e0c4b0ce34c36f47c289.tar.bz2 gentoo-2-b4c277acb92bfb5a1c49e0c4b0ce34c36f47c289.zip | |
bug #330023
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang/php')
| -rw-r--r-- | dev-lang/php/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/php/files/eblits/src_test-v1.eblit | 12 |
2 files changed, 11 insertions, 7 deletions
diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog index 43a2e5929834..1f652e21c7b8 100644 --- a/dev-lang/php/ChangeLog +++ b/dev-lang/php/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/php # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.403 2010/08/09 10:27:53 mabi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.404 2010/08/09 10:47:58 mabi Exp $ + + 09 Aug 2010; Matti Bickel <mabi@gentoo.org> + files/eblits/src_test-v1.eblit: + run from cli sapi build dir (bug #330023) 09 Aug 2010; Matti Bickel <mabi@gentoo.org> files/eblits/src_install-v1.eblit: diff --git a/dev-lang/php/files/eblits/src_test-v1.eblit b/dev-lang/php/files/eblits/src_test-v1.eblit index 5196c87cad08..95ebc7db1e9d 100644 --- a/dev-lang/php/files/eblits/src_test-v1.eblit +++ b/dev-lang/php/files/eblits/src_test-v1.eblit @@ -1,24 +1,24 @@ # Copyright 1999-2010 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.1 2010/05/27 23:05:04 mabi Exp $ +# $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 $ eblit-php-src_test() { vecho ">>> Test phase [test]: ${CATEGORY}/${PF}" - if [[ ! -x "${S}/sapi/cli/php" ]] ; then + if [[ ! -x "${WORKDIR}/sapis/cli/php" ]] ; then ewarn "Test phase requires USE=cli, skipping" return else - export TEST_PHP_EXECUTABLE="${S}/sapi/cli/php" + export TEST_PHP_EXECUTABLE="${WORKDIR}/sapis/cli/php" fi - if [[ -x "${S}/sapi/cgi/php-cgi" ]] ; then - export TEST_PHP_CGI_EXECUTABLE="${S}/sapi/cgi/php-cgi" + if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then + export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi" fi REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d "session.save_path=${T}" \ - "${S}/run-tests.php" -n -q -d "session.save_path=${T}" + "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}" for name in ${EXPECTED_TEST_FAILURES}; do mv "${name}.out" "${name}.out.orig" 2>/dev/null |