summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatti Bickel <mabi@gentoo.org>2010-08-09 10:47:58 +0000
committerMatti Bickel <mabi@gentoo.org>2010-08-09 10:47:58 +0000
commitb7d3f46dbb145ebfdc9bd794e04f6bdff05b9140 (patch)
tree0964a479bcf50e53ce921875b3bf172d9c10569d /dev-lang/php
parentremove old ebuilds - RESTRICT=test (#315725) (diff)
downloadhistorical-b7d3f46dbb145ebfdc9bd794e04f6bdff05b9140.tar.gz
historical-b7d3f46dbb145ebfdc9bd794e04f6bdff05b9140.tar.bz2
historical-b7d3f46dbb145ebfdc9bd794e04f6bdff05b9140.zip
bug #330023
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
Diffstat (limited to 'dev-lang/php')
-rw-r--r--dev-lang/php/ChangeLog6
-rw-r--r--dev-lang/php/Manifest4
-rw-r--r--dev-lang/php/files/eblits/src_test-v1.eblit12
3 files changed, 13 insertions, 9 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/Manifest b/dev-lang/php/Manifest
index a4014b302b65..b886d938b3dd 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -11,7 +11,7 @@ AUX eblits/src_configure-v1.eblit 10840 RMD160 c6954d814f3a7b6b0854e2f075d73a497
AUX eblits/src_configure-v52.eblit 9725 RMD160 42a1fa556a93e49ba2d15bb4404d08fb15782f74 SHA1 3ae459cf8575364a3870a66e18216d1dc49a7858 SHA256 11dc18f439dadcec9a09dd9c06a68ad6a689b9623cea6d1858565ed881b29699
AUX eblits/src_install-v1.eblit 4909 RMD160 7523f7b1189363a04451ed3141b0c6f7465267a6 SHA1 3346dcba01d2812ecdd77ac2701ca8e3ac4afa5b SHA256 4366984f3426eca8231f8dde2f02727abf7fb5ff02fcf675d87f3f71d80683df
AUX eblits/src_prepare-v1.eblit 2616 RMD160 ccff64d09cc90ada1ea5d1311457cf9a05f12f8e SHA1 7db40d0ca7ef01e5b61962f261511803f768f1bc SHA256 915b9755a37f7670f6e436fe5072dae8f5e6b437ccdfbff835e26bb2f9d22b1e
-AUX eblits/src_test-v1.eblit 1480 RMD160 68ef731042ef236efee923649b318239c0219d52 SHA1 81c047f180e43eb1e6b0309ee8d6751950ce1b97 SHA256 ddc836ca2e7b2abac20450fc6eb8c7d30277c567d23051016b903ece1d07a6b2
+AUX eblits/src_test-v1.eblit 1530 RMD160 10031a5128dab729106c6fbfe4e899b1583818cb SHA1 0f1abf995913c2c381e2496b8670ea4f6e97964b SHA256 67501925cfdaf9043e4985d0f1c797e62fb42bf47e6863b5ffdecb104888e82c
AUX php-5.2.10-pdo_dblib.patch 559 RMD160 062604e291113b2bb86044b5eeffb72fad210fbc SHA1 d59d26e6557dac86e582e1a6ed7bb4795cf150c6 SHA256 0548d63d7379cd19f7ade6ca1222b1b577f684b142ff6b0e8e23742b1f7f9794
AUX php-5.2.12-libpng14.patch 222 RMD160 d63bd712d077d9606a02d6620c7084bca7197c01 SHA1 a25a47386d625a47698094fc4825208c6ec8f2a4 SHA256 af94a9c2a104dcb037aa059dd46b6f534adb939ea44ad4cb9e3a0a7c49b64fab
AUX php-fpm-gentooified.patch 1846 RMD160 60b07cfcf41d41f453aba9a2747dc3d0a26fa016 SHA1 997e4e15057e497a8513a51225cdb9bd29fedd0a SHA256 262c02ad320408314e7635d403bd89b711374fcee09ecb37375e3406a0cc944a
@@ -33,5 +33,5 @@ EBUILD php-5.2.13.ebuild 16859 RMD160 e899ea551626ec77614931e052189a51b52cac5f S
EBUILD php-5.2.14.ebuild 9072 RMD160 431a359b11f6eea093810d4c75c91a60b81244c7 SHA1 43f10aaf4fc98cf0b5112d461b52aab3896461c2 SHA256 ca023b01ef470c5a55ce34050766c97defe08c8ca66c3c012a876bb2add3fa95
EBUILD php-5.3.2.ebuild 9228 RMD160 a809dae438ea243e519b4b46d00ebe1cd3eb09ee SHA1 ea00f7476447459337e3c967948293d67ff32818 SHA256 868a4e6dc6a158bcdba7dc4178e2f317273775675caf061e0796ea8ec9f406f0
EBUILD php-5.3.3-r1.ebuild 9488 RMD160 924e4983967f64f00ebe008f39612276b76363d6 SHA1 39d27e6c8784a28d4af3f08e14d7ae14c8b44449 SHA256 8cf49205fe501c03adbb0e2e3be4cb97ae1889c6e787028aac7453b9cbe7fa50
-MISC ChangeLog 69643 RMD160 87d03b3f58f463a378f7142f8affbb76f8a0ad01 SHA1 14dd2451eb9718c9269f347dfe3bee0740ebbfd6 SHA256 afaec7fa32848a3a7c1eb38711aa1679c8fb2d3ee477801043512528b97c928a
+MISC ChangeLog 69768 RMD160 c7f679bf9dafb52be08f5681b801db70f65ae873 SHA1 7f578a39afed6dd59108a379518b16e46e3e117e SHA256 8ab8f93560713ba24a51ed464ec17b06ab63c4e8f9aabe95898e17aa30a39c06
MISC metadata.xml 2251 RMD160 4167b367fe5472e090fec27c09a465e558b8caf9 SHA1 059e3863cc1e500cf438f12ca98fe7f4ebd24722 SHA256 f402e3753e18c32922a694ab1bbde615754f26bbebc401b90b18f57bf5e49342
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