[Pkg-php-commits] r920 - php5/trunk/debian

[Raphael Geissert]

Author: atomo64-guest
Date: 2007-11-21 02:51:04 +0000 (Wed, 21 Nov 2007)
New Revision: 920

Modified:
   php5/trunk/debian/changelog
   php5/trunk/debian/rules
Log:
debian/rules: now DEB_BUILD_OPTIONS=nocheck aware


Modified: php5/trunk/debian/changelog
===================================================================
--- php5/trunk/debian/changelog	2007-11-13 23:11:19 UTC (rev 919)
+++ php5/trunk/debian/changelog	2007-11-21 02:51:04 UTC (rev 920)
@@ -1,11 +1,15 @@
 php5 (5.2.5-1) UNRELEASED; urgency=low
 
+  [ Sean Finney ]
   * New upstream release
   * Updated suhosin patch for 5.2.5 minus ./configure as before.
   * Not yet released.
 
- -- Sean Finney <seanius at debian.org>  Tue, 13 Nov 2007 21:49:25 +0100
+  [ Raphael Geissert ]
+  * debian/rules: now DEB_BUILD_OPTIONS=nocheck aware
 
+ -- Raphael Geissert <atomo64 at gmail.com>  Tue, 20 Nov 2007 20:47:15 -0600
+
 php5 (5.2.4-2) unstable; urgency=low
 
   [ sean finney ]

Modified: php5/trunk/debian/rules
===================================================================
--- php5/trunk/debian/rules	2007-11-13 23:11:19 UTC (rev 919)
+++ php5/trunk/debian/rules	2007-11-21 02:51:04 UTC (rev 920)
@@ -131,9 +131,13 @@
 	rm -f prepared-stamp
 
 test-results.txt:
+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
 	rm -rf temp_session_store
+else
+	echo 'nocheck found in DEB_BUILD_OPTIONS' > test-results.txt
+endif
 	cat test-results.txt
 
 build: build-apache2-stamp build-cgi-stamp build-cli-stamp build-pear-stamp test-results.txt