packages: php/bug-test-pcntl-55479.patch (NEW) - fix for pcntl test fail wi...

[glen]

Author: glen                         Date: Mon Aug 22 17:05:05 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix for pcntl test fail with mismatching php versions of installed and building one

---- Files affected:
packages/php:
   bug-test-pcntl-55479.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/php/bug-test-pcntl-55479.patch
diff -u /dev/null packages/php/bug-test-pcntl-55479.patch:1.1
--- /dev/null	Mon Aug 22 19:05:05 2011
+++ packages/php/bug-test-pcntl-55479.patch	Mon Aug 22 19:05:00 2011
@@ -0,0 +1,35 @@
+need to setup extension dir to current build instead of defaulting to system
+defaults (which may be different php version)
+also use preprocessed PHP.INI from test framework
+
+--- php-5.4.0alpha3/ext/pcntl/tests/pcntl_exec.phpt	2011-06-24 22:18:06.000000000 +0300
++++ php-5.4.0alpha3/ext/pcntl/tests/pcntl_exec.phpt	2011-08-22 09:36:01.105334996 +0300
+@@ -8,7 +8,10 @@
+ --FILE--
+ <?php
+ echo "ok\n";
+-pcntl_exec(getenv("TEST_PHP_EXECUTABLE"));
++$php = getenv("TEST_PHP_EXECUTABLE");
++$extension_dir = ini_get("extension_dir");
++$inipath = php_ini_loaded_file();
++pcntl_exec($php, array("-n", "-d$extension_dir", "-c$inipath"));
+ echo "nok\n";
+ ?>
+ --EXPECT--
+--- php-5.4.0alpha3/ext/pcntl/tests/pcntl_exec_2.phpt~	2011-06-24 22:18:06.000000000 +0300
++++ php-5.4.0alpha3/ext/pcntl/tests/pcntl_exec_2.phpt	2011-08-22 19:57:12.780576314 +0300
+@@ -14,7 +14,13 @@
+ 	exit;
+ }
+ echo "ok\n";
+-pcntl_exec(getenv("TEST_PHP_EXECUTABLE"), array(__FILE__), array(
++
++$php = getenv("TEST_PHP_EXECUTABLE");
++$extension_dir = ini_get("extension_dir");
++$inipath = php_ini_loaded_file();
++$args = array("-n", "-d$extension_dir", "-c$inipath", __FILE__);
++
++pcntl_exec($php, $args, array(
+ 	b"PCNTL_EXEC_TEST_IS_CHILD" => b"1", 
+ 	b"FOO" => b"BAR",
+ 	1 => b"long")
================================================================