packages: php/php.spec - sort ini files with locale independant strcmp (mer...

[glen]

Author: glen                         Date: Wed Mar 17 16:45:17 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- sort ini files with locale independant strcmp (merge php-sapi-ini-file.patch at 1.9.4.1)
- testing related fixes

---- Files affected:
packages/php:
   php.spec (1.862 -> 1.863) 

---- Diffs:

================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.862 packages/php/php.spec:1.863
--- packages/php/php.spec:1.862	Wed Mar 17 14:28:49 2010
+++ packages/php/php.spec	Wed Mar 17 17:45:11 2010
@@ -94,7 +94,7 @@
 %undefine	with_filter
 %endif
 
-%define		rel		0.16
+%define		rel		0.17
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):	Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):	Język skryptowy PHP
@@ -1821,7 +1821,7 @@
 # says just "Terminated" twice and fails
 mv sapi/cli/tests/022.phpt{,.broken}
 
-sh %{_sourcedir}/skip-tests.sh
+sh -xe %{_sourcedir}/skip-tests.sh
 
 %build
 API=$(awk '/#define PHP_API_VERSION/{print $3}' main/php.h)
@@ -2101,13 +2101,14 @@
 unset NO_INTERACTION REPORT_EXIT_STATUS MALLOC_CHECK_
 
 # collect failed tests into cleanup script used in prep.
-sed -ne '/FAILED TEST SUMMARY/,/^===/p' test.log | sed -e '/^===/,$d' | \
-sed -ne '/\[.*\]/{s/\(.*\) \[\(.*\)\]/: \1\nmv \2{,.skip}/p}' \
-	> %{_sourcedir}/skip-tests.sh
-
-# TODO:
-# check if tests have failed
-# think how to keep in skip-tests.sh only with failed tests (repeative run discards earlier values)
+sed -ne '/FAILED TEST SUMMARY/,/^===/p' test.log | sed -e '1,/^---/d;/^===/,$d' > tests-failed.log
+sed -ne '/\[.*\]/{s/\(.*\) \[\(.*\)\]/# \1\nmv \2{,.skip}/p}' tests-failed.log \
+	>> %{_sourcedir}/skip-tests.sh
+
+failed=$(wc -l < tests-failed.log)
+if [ "$failed" ! = 0 ]; then
+	exit 1
+fi
 %endif
 
 %install
@@ -3043,6 +3044,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.863  2010/03/17 16:45:11  glen
+- sort ini files with locale independant strcmp (merge php-sapi-ini-file.patch at 1.9.4.1)
+- testing related fixes
+
 Revision 1.862  2010/03/17 13:28:49  glen
 - make tests to work
 - auto patch skiper included
================================================================

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