]>
Commit | Line | Data |
---|---|---|
c638a5d4 | 1 | need to setup extension dir to current build instead of defaulting to system |
2 | defaults (which may be different php version) | |
3 | also use preprocessed PHP.INI from test framework | |
4 | ||
5 | --- php-5.4.0alpha3/ext/pcntl/tests/pcntl_exec.phpt 2011-06-24 22:18:06.000000000 +0300 | |
6 | +++ php-5.4.0alpha3/ext/pcntl/tests/pcntl_exec.phpt 2011-08-22 09:36:01.105334996 +0300 | |
7 | @@ -8,7 +8,10 @@ | |
8 | --FILE-- | |
9 | <?php | |
10 | echo "ok\n"; | |
11 | -pcntl_exec(getenv("TEST_PHP_EXECUTABLE")); | |
12 | +$php = getenv("TEST_PHP_EXECUTABLE"); | |
13 | +$extension_dir = ini_get("extension_dir"); | |
14 | +$inipath = php_ini_loaded_file(); | |
15 | +pcntl_exec($php, array("-n", "-d$extension_dir", "-c$inipath")); | |
16 | echo "nok\n"; | |
17 | ?> | |
18 | --EXPECT-- | |
19 | --- php-5.4.0alpha3/ext/pcntl/tests/pcntl_exec_2.phpt~ 2011-06-24 22:18:06.000000000 +0300 | |
20 | +++ php-5.4.0alpha3/ext/pcntl/tests/pcntl_exec_2.phpt 2011-08-22 19:57:12.780576314 +0300 | |
21 | @@ -14,7 +14,13 @@ | |
22 | exit; | |
23 | } | |
24 | echo "ok\n"; | |
25 | -pcntl_exec(getenv("TEST_PHP_EXECUTABLE"), array(__FILE__), array( | |
26 | + | |
27 | +$php = getenv("TEST_PHP_EXECUTABLE"); | |
28 | +$extension_dir = ini_get("extension_dir"); | |
29 | +$inipath = php_ini_loaded_file(); | |
30 | +$args = array("-n", "-d$extension_dir", "-c$inipath", __FILE__); | |
31 | + | |
32 | +pcntl_exec($php, $args, array( | |
33 | b"PCNTL_EXEC_TEST_IS_CHILD" => b"1", | |
34 | b"FOO" => b"BAR", | |
35 | 1 => b"long") |