packages (PHP_5_2): php/php.spec - update order for tests to be run with cl...

[glen]

Author: glen                         Date: Tue Mar 16 10:07:46 2010 GMT
Module: packages                      Tag: PHP_5_2
---- Log message:
- update order for tests to be run with cli sapi config/makefile

---- Files affected:
packages/php:
   php.spec (1.805.2.49 -> 1.805.2.50) 

---- Diffs:

================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.805.2.49 packages/php/php.spec:1.805.2.50
--- packages/php/php.spec:1.805.2.49	Tue Mar 16 11:05:32 2010
+++ packages/php/php.spec	Tue Mar 16 11:07:41 2010
@@ -2084,11 +2084,6 @@
 %{__make} sapi/cgi/php-cgi -f Makefile.cgi
 [ "$(echo '<?=php_sapi_name();' | ./sapi/cgi/php-cgi -qn)" = cgi ] || exit 1
 
-# CLI
-cp -af php_config.h.cli main/php_config.h
-%{__make} sapi/cli/php -f Makefile.cli
-[ "$(echo '<?=php_sapi_name();' | ./sapi/cli/php -n)" = cli ] || exit 1
-
 # FCGI
 %if %{with fcgi}
 cp -af php_config.h.fcgi main/php_config.h
@@ -2106,6 +2101,11 @@
 [ "$(echo '<?=php_sapi_name();' | ./sapi/fpm/php-cgi -qn)" = cgi-fcgi ] || exit 1
 %endif
 
+# CLI
+cp -af php_config.h.cli main/php_config.h
+%{__make} sapi/cli/php -f Makefile.cli
+[ "$(echo '<?=php_sapi_name();' | ./sapi/cli/php -n)" = cli ] || exit 1
+
 # Generate stub .ini files for each extension
 rm -rf conf.d
 install -d conf.d
@@ -2138,6 +2138,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
@@ -3091,6 +3093,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.805.2.50  2010/03/16 10:07:41  glen
+- update order for tests to be run with cli sapi config/makefile
+
 Revision 1.805.2.49  2010/03/16 10:05:32  glen
 - preamble merges with HEAD
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.805.2.49&r2=1.805.2.50&f=u