packages: php/php.spec - tests need cli sapi config/makefile
glen
glen at pld-linux.org
Tue Mar 16 10:47:09 CET 2010
Author: glen Date: Tue Mar 16 09:47:09 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- tests need cli sapi config/makefile
---- Files affected:
packages/php:
php.spec (1.852 -> 1.853)
---- Diffs:
================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.852 packages/php/php.spec:1.853
--- packages/php/php.spec:1.852 Tue Mar 16 10:17:46 2010
+++ packages/php/php.spec Tue Mar 16 10:47:04 2010
@@ -2032,6 +2032,7 @@
%{__make} -f Makefile.cli
[ "$(echo '<?=php_sapi_name();' | ./sapi/cli/php -qn)" = cli ] || exit 1
+# PHP FPM
%if %{with fpm}
cp -af php_config.h.fpm main/php_config.h
%{__make} -f Makefile.fpm
@@ -2040,6 +2041,8 @@
%if %{with tests}
# Run tests, using the CLI SAPI
+cp -af php_config.h.cli main/php_config.h
+cp -af Makefile.cli Makefile
export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2
unset TZ LANG LC_ALL || :
%{__make} test
@@ -3017,6 +3020,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.853 2010/03/16 09:47:04 glen
+- tests need cli sapi config/makefile
+
Revision 1.852 2010/03/16 09:17:46 glen
- revert unwanted commit
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.852&r2=1.853&f=u
More information about the pld-cvs-commit
mailing list