From 9b45658257a4fcfb10cdab22a3a55ca38978fd02 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Mon, 22 Aug 2011 17:05:00 +0000 Subject: [PATCH] - fix for pcntl test fail with mismatching php versions of installed and building one Changed files: bug-test-pcntl-55479.patch -> 1.1 --- bug-test-pcntl-55479.patch | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 bug-test-pcntl-55479.patch diff --git a/bug-test-pcntl-55479.patch b/bug-test-pcntl-55479.patch new file mode 100644 index 0000000..8f20b23 --- /dev/null +++ b/bug-test-pcntl-55479.patch @@ -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-- + + --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") -- 2.44.0