[Pkg-php-commits] r909 - in php5/trunk/debian: . patches
Steve Langasek
vorlon at alioth.debian.org
Sun Oct 21 09:38:30 UTC 2007
Author: vorlon
Date: 2007-10-21 09:38:29 +0000 (Sun, 21 Oct 2007)
New Revision: 909
Added:
php5/trunk/debian/patches/fix_broken_upstream_tests.patch
Modified:
php5/trunk/debian/changelog
php5/trunk/debian/patches/052-phpinfo_no_configure.patch
php5/trunk/debian/patches/series
php5/trunk/debian/rules
Log:
Now that the testsuite is being run at build time, test failures cause a
bunch of junk files to be left around in the Debian diff. So clean up
several false-positive failures:
- 052-phpinfo_no_configure.patch: we're patching the output of phpinfo(),
so patch the test as well
- fix_broken_upstream_tests.patch: use a local directory for tests that use
sessions, skip the phpinfo test after all because it doesn't appear to be
compatible with current testsuite behavior, and disable the moneyformat
test if en_US locale is not available.
There are still several other failing tests, but these are not false
positives and remain enabled pending investigation.
Modified: php5/trunk/debian/changelog
===================================================================
--- php5/trunk/debian/changelog 2007-10-21 04:13:46 UTC (rev 908)
+++ php5/trunk/debian/changelog 2007-10-21 09:38:29 UTC (rev 909)
@@ -20,8 +20,19 @@
which triggers a warning about disappearing files when building the
source package but avoids carrying irrelevant diffs to these files
in the Debian diff.
+ * Now that the testsuite is being run at build time, test failures cause
+ a bunch of junk files to be left around in the Debian diff. So clean up
+ several false-positive failures:
+ - 052-phpinfo_no_configure.patch: we're patching the output of phpinfo(),
+ so patch the test as well
+ - fix_broken_upstream_tests.patch: use a local directory for tests that
+ use sessions, skip the phpinfo test after all because it doesn't appear
+ to be compatible with current testsuite behavior, and disable the
+ moneyformat test if en_US locale is not available.
+ There are still several other failing tests, but these are not false
+ positives and remain enabled pending investigation.
- -- Steve Langasek <vorlon at debian.org> Sat, 20 Oct 2007 16:35:49 -0700
+ -- Steve Langasek <vorlon at debian.org> Sun, 21 Oct 2007 02:18:07 -0700
php5 (5.2.4-1) unstable; urgency=low
Modified: php5/trunk/debian/patches/052-phpinfo_no_configure.patch
===================================================================
--- php5/trunk/debian/patches/052-phpinfo_no_configure.patch 2007-10-21 04:13:46 UTC (rev 908)
+++ php5/trunk/debian/patches/052-phpinfo_no_configure.patch 2007-10-21 09:38:29 UTC (rev 909)
@@ -1,7 +1,7 @@
-Index: php5-5.2.2/ext/standard/info.c
+Index: php-5.2.4/ext/standard/info.c
===================================================================
---- php5-5.2.2.orig/ext/standard/info.c 2007-04-02 14:41:07.000000000 +0200
-+++ php5-5.2.2/ext/standard/info.c 2007-05-04 17:42:37.000000000 +0200
+--- php-5.2.4.orig/ext/standard/info.c
++++ php-5.2.4/ext/standard/info.c
@@ -461,7 +461,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "System", php_uname );
@@ -11,3 +11,15 @@
php_info_print_table_row(2, "Configure Command", CONFIGURE_COMMAND );
#endif
if (sapi_module.pretty_name) {
+Index: php-5.2.4/ext/standard/tests/general_functions/phpinfo.phpt
+===================================================================
+--- php-5.2.4.orig/ext/standard/tests/general_functions/phpinfo.phpt
++++ php-5.2.4/ext/standard/tests/general_functions/phpinfo.phpt
+@@ -20,7 +20,6 @@
+
+ System => %s
+ Build Date => %s
+-Configure Command => %s
+ Server API => Command Line Interface
+ Virtual Directory Support => %s
+ Configuration File (php.ini) Path => %s
Added: php5/trunk/debian/patches/fix_broken_upstream_tests.patch
===================================================================
--- php5/trunk/debian/patches/fix_broken_upstream_tests.patch (rev 0)
+++ php5/trunk/debian/patches/fix_broken_upstream_tests.patch 2007-10-21 09:38:29 UTC (rev 909)
@@ -0,0 +1,61 @@
+Index: php-5.2.4/tests/basic/bug20539.phpt
+===================================================================
+--- php-5.2.4.orig/tests/basic/bug20539.phpt
++++ php-5.2.4/tests/basic/bug20539.phpt
+@@ -3,6 +3,7 @@
+ --INI--
+ session.auto_start=1
+ session.save_handler=files
++session.save_path=temp_session_store
+ --FILE--
+ <?php
+ print "good :)\n";
+Index: php-5.2.4/ext/soap/tests/server009.phpt
+===================================================================
+--- php-5.2.4.orig/ext/soap/tests/server009.phpt
++++ php-5.2.4/ext/soap/tests/server009.phpt
+@@ -7,6 +7,10 @@
+ die('skip this test needs session extension');
+ }
+ ?>
++--INI--
++session.auto_start=1
++session.save_handler=files
++session.save_path=temp_session_store
+ --FILE--
+ <?php
+ class foo {
+Index: php-5.2.4/ext/standard/tests/general_functions/phpinfo.phpt
+===================================================================
+--- php-5.2.4.orig/ext/standard/tests/general_functions/phpinfo.phpt
++++ php-5.2.4/ext/standard/tests/general_functions/phpinfo.phpt
+@@ -1,5 +1,7 @@
+ --TEST--
+ phpinfo()
++--SKIPIF--
++<?php die("SKIP phpinfo - test suite's handling of "%s" is incompatible with this test"); ?>
+ --FILE--
+ <?php
+ var_dump(phpinfo());
+@@ -23,6 +25,8 @@
+ Server API => Command Line Interface
+ Virtual Directory Support => %s
+ Configuration File (php.ini) Path => %s
++Loaded Configuration File => %s
++Scan this dir for additional .ini files => %s
+ PHP API => %d
+ PHP Extension => %d
+ Zend Extension => %d
+Index: php-5.2.4/ext/standard/tests/strings/moneyformat.phpt
+===================================================================
+--- php-5.2.4.orig/ext/standard/tests/strings/moneyformat.phpt
++++ php-5.2.4/ext/standard/tests/strings/moneyformat.phpt
+@@ -5,6 +5,8 @@
+ if (!function_exists('money_format') || !function_exists('setlocale')) {
+ die("SKIP money_format - not supported\n");
+ }
++ if (!setlocale(LC_MONETARY, 'en_US'))
++ die("SKIP money_format - en_US locale not available\n");
+ ?>
+ --FILE--
+ <?php
Modified: php5/trunk/debian/patches/series
===================================================================
--- php5/trunk/debian/patches/series 2007-10-21 04:13:46 UTC (rev 908)
+++ php5/trunk/debian/patches/series 2007-10-21 09:38:29 UTC (rev 909)
@@ -26,3 +26,4 @@
113-php.ini_securitynotes.patch
disable_dl_by_default.patch
suhosin.patch
+fix_broken_upstream_tests.patch
Modified: php5/trunk/debian/rules
===================================================================
--- php5/trunk/debian/rules 2007-10-21 04:13:46 UTC (rev 908)
+++ php5/trunk/debian/rules 2007-10-21 09:38:29 UTC (rev 909)
@@ -134,7 +134,9 @@
rm -f prepared-stamp
test-results.txt:
+ 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
cat test-results.txt
build: build-apache2-stamp build-cgi-stamp build-cli-stamp build-pear-stamp test-results.txt
More information about the Pkg-php-commits
mailing list