[Pkg-php-commits] [php/debian-sid] Pass full path to php cli executable for unit tests
Sean Finney
seanius at debian.org
Mon Feb 15 08:13:02 UTC 2010
At least one of the currently failing tests involved a call to the
cli executable from a different subdirectory. Specifying the full
path with $(CURDIR) can work around this problem.
---
debian/rules | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/debian/rules b/debian/rules
index beadd46..e0664f2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -157,7 +157,7 @@ unprepared:
test-results.txt: build-apache2-stamp build-cli-stamp build-cgi-stamp
ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
mkdir -p temp_session_store
- env NO_INTERACTION=1 TEST_PHP_CGI_EXECUTABLE=./cgi-build/sapi/cgi/cgi-bin.php5 TEST_PHP_EXECUTABLE=./apache2-build/sapi/cli/php ./apache2-build/sapi/cli/php run-tests.php | tee test-results.txt
+ env NO_INTERACTION=1 TEST_PHP_CGI_EXECUTABLE=$(CURDIR)/cgi-build/sapi/cgi/cgi-bin.php5 TEST_PHP_EXECUTABLE=$(CURDIR)/apache2-build/sapi/cli/php $(CURDIR)/apache2-build/sapi/cli/php run-tests.php | tee test-results.txt
rm -rf temp_session_store
@for test in `find . -name '*.log' -a '!' -name 'config.log'`; do \
echo; \
--
1.6.3.3
More information about the Pkg-php-commits
mailing list