Author: glen Date: Sun Jun 13 20:36:56 2010 GMT Module: packages Tag: HEAD ---- Log message: - gcov bcond
---- Files affected: packages/php: php.spec (1.874 -> 1.875) , skip-tests.sh (1.4 -> 1.5) ---- Diffs: ================================================================ Index: packages/php/php.spec diff -u packages/php/php.spec:1.874 packages/php/php.spec:1.875 --- packages/php/php.spec:1.874 Mon Jun 7 21:36:45 2010 +++ packages/php/php.spec Sun Jun 13 22:36:50 2010 @@ -62,6 +62,7 @@ %bcond_without fpm # fpm patches from http://www.php-fpm.org/ %bcond_without suhosin # with suhosin patch %bcond_with tests # default off; test process very often hangs on builders, approx run time 45m; perform "make test" +%bcond_with gcov # Enable Code coverage reporting %bcond_with type_hints # experimental support for strict typing/casting %define apxs1 /usr/sbin/apxs1 @@ -212,6 +213,7 @@ %if %{with openssl} || %{with ldap} BuildRequires: openssl-devel >= 0.9.7d %endif +%{?with_gcov:BuildRequires: lcov} %{?with_snmp:BuildRequires: net-snmp-devel >= 5.0.7} BuildRequires: pam-devel %{?with_pcre:BuildRequires: pcre-devel >= 6.6} @@ -256,6 +258,10 @@ %define zend_zts %{!?with_zts:0}%{?with_zts:1} %define php_debug %{!?debug:0}%{?debug:1} +%if %{with gcov} +%undefine with_ccache +%endif + %if %{with oci8} # ORACLE_HOME is required for oci8 ext to build %define _preserve_env %_preserve_env_base ORACLE_HOME @@ -447,8 +453,8 @@ Provides: php-standard Provides: php5(debug) = %{php_debug} Provides: php5(thread-safety) = %{zend_zts} -Obsoletes: php-pecl-domxml %{!?with_mysqlnd:Obsoletes: php-mysqlnd} +Obsoletes: php-pecl-domxml Conflicts: php4-common < 3:4.4.4-8 Conflicts: rpm < 4.4.2-0.2 @@ -1908,7 +1914,7 @@ sapi_args='--disable-cli' ;; cli) - sapi_args='--disable-cgi' + sapi_args='--disable-cgi %{?with_gcov:--enable-gcov}' ;; fpm) sapi_args='--disable-cli --with-fpm' @@ -2127,7 +2133,7 @@ cp -af Makefile.cli Makefile export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2 unset TZ LANG LC_ALL || : -%{__make} test RUN_TESTS_SETTINGS="-s test.log" +%{__make} test RUN_TESTS_SETTINGS="-s test.log" PHP_TEST_SHARED_SYSTEM_EXTENSIONS= unset NO_INTERACTION REPORT_EXIT_STATUS MALLOC_CHECK_ # collect failed tests into cleanup script used in prep. @@ -3082,6 +3088,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.875 2010/06/13 20:36:50 glen +- gcov bcond + Revision 1.874 2010/06/07 19:36:45 glen - release 5 ================================================================ Index: packages/php/skip-tests.sh diff -u packages/php/skip-tests.sh:1.4 packages/php/skip-tests.sh:1.5 --- packages/php/skip-tests.sh:1.4 Wed Mar 17 17:40:56 2010 +++ packages/php/skip-tests.sh Sun Jun 13 22:36:50 2010 @@ -206,3 +206,35 @@ mv ext/standard/tests/file/lstat_stat_variation19.phpt{,.skip} # Test fileinode() function: usage variations - diff. path notations mv ext/standard/tests/file/fileinode_variation3.phpt{,.skip} +# curl_error() function - basic test for curl_error using a fake url +mv ext/curl/tests/curl_error_basic.phpt{,.skip} +# gmp_nextprime() +mv ext/gmp/tests/gmp_nextprime.phpt{,.skip} +# datefmt_format_code() and datefmt_parse_code() +mv ext/intl/tests/dateformat_format_parse.phpt{,.skip} +# datefmt_get_pattern_code and datefmt_set_pattern_code() +mv ext/intl/tests/dateformat_get_set_pattern.phpt{,.skip} +# numfmt_get/set_attribute() +mv ext/intl/tests/formatter_get_set_attribute.phpt{,.skip} +# grapheme() +mv ext/intl/tests/grapheme.phpt{,.skip} +# Bug #28382 (openssl_x509_parse extensions support) +mv ext/openssl/tests/bug28382.phpt{,.skip} +# Bug #47828 (segfaults when a UTF-8 conversion fails openssl_x509_parse()) +mv ext/openssl/tests/bug47828.phpt{,.skip} +# openssl_x509_parse() basic test +mv ext/openssl/tests/openssl_x509_parse_basic.phpt{,.skip} +# MySQL PDO->__construct(), libmysql only options +mv ext/pdo_mysql/tests/pdo_mysql___construct_options_libmysql.phpt{,.skip} +# Test function getservbyport() by calling it more than or less than its expected arguments +mv ext/standard/tests/general_functions/getservbyname_basic.phpt{,.skip} +# Test var_dump() function +mv ext/standard/tests/general_functions/var_dump_64bit.phpt{,.skip} +# time_sleep_until() function - basic test for time_sleep_until() +mv ext/standard/tests/misc/time_sleep_until_basic.phpt{,.skip} +# getmxrr() test +mv ext/standard/tests/network/getmxrr.phpt{,.skip} +# Bug #40576 (double values are truncated to 6 decimal digits when encoding) +mv ext/xmlrpc/tests/bug40576_64bit.phpt{,.skip} +# Bug #45555 (Segfault with invalid non-string as register_introspection_callback) +mv ext/xmlrpc/tests/bug45555.phpt{,.skip} ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.874&r2=1.875&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/skip-tests.sh?r1=1.4&r2=1.5&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
