[Pkg-php-commits] [php/debian-experimental] * Use tee during test run so we can watch the output. * Add build-deps for libglib2.0-dev and libicu-dev to make pbuilder happy.
Mark A. Hershberger
mah at everybody.org
Wed Jan 20 04:13:27 UTC 2010
---
debian/control | 2 ++
debian/rules | 5 ++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/debian/control b/debian/control
index e4375d1..ce58009 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,9 @@ Build-Depends: apache2-prefork-dev,
libfreetype6-dev,
libgcrypt11-dev,
libgd2-xpm-dev,
+ libglib2.0-dev,
libgmp3-dev,
+ libicu-dev,
libjpeg62-dev,
libkrb5-dev,
libldap2-dev,
diff --git a/debian/rules b/debian/rules
index 3a2365b..8e01d0c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -145,12 +145,11 @@ 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 > test-results.txt
+ 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
rm -rf temp_session_store
else
- echo 'nocheck found in DEB_BUILD_OPTIONS' > test-results.txt
+ echo 'nocheck found in DEB_BUILD_OPTIONS' | tee test-results.txt
endif
- cat test-results.txt
build: build-apache2-stamp build-apache2filter-stamp build-cgi-stamp build-cli-stamp build-pear-stamp test-results.txt
--
1.6.3.3
More information about the Pkg-php-commits
mailing list