[patch] Patch for src_test-v1.eblit

src_test-v1.patch (text/plain), 1.31 KB, created by Vladimir Tsisaruk on 2010-07-27 04:41:46 UTC

diff --git a/dev-lang/php/files/eblits/src_test-v1.eblit b/dev-lang/php/files/eblits/src_test-v1.eblit
--- a/dev-lang/php/files/eblits/src_test-v1.eblit
+++ b/dev-lang/php/files/eblits/src_test-v1.eblit
@@ -5,18 +5,29 @@
 eblit-php-src_test() {
 	vecho ">>> Test phase [test]: ${CATEGORY}/${PF}"
 
-	if [[ ! -x "${S}/sapi/cli/php" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${S}/sapi/cli/php"
+	PHP_EXECUTABLE="${S}/sapi/cli/php"
+	PHP_CGI_EXECUTABLE="${S}/sapi/cgi/php-cgi"
+
+	if [[ ! -x "${PHP_EXECUTABLE}" ]] ; then
+		if [[ -x "${WORKDIR}/sapis/cli/php" ]] ; then
+			PHP_EXECUTABLE="${WORKDIR}/sapis/cli/php"
+		else
+			ewarn "Test phase requires USE=cli, skipping"
+			return
+		fi
 	fi
 
-	if [[ -x "${S}/sapi/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${S}/sapi/cgi/php-cgi"
+	if [[ ! -x "${PHP_CGI_EXECUTABLE}" ]] ; then
+		if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]]; then
+			PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
+		else
+			PHP_CGI_EXECUTABLE=""
+		fi
 	fi
-	
-	
+
+	sed -re "s|^(PHP_EXECUTABLE).+\$|\1 = \"${PHP_EXECUTABLE}\"|" -i Makefile
+	sed -re "s|^(PHP_CGI_EXECUTABLE).+\$|\1 = \"${PHP_CGI_EXECUTABLE}\"|" -i Makefile
+
 	LC_ALL="en_US" LANG="en_US.UTF-8" TMPDIR="${T}" REPORT_EXIT_STATUS=1 \
 	NO_INTERACTION="1" \
 	emake test