diff options
author | Rasmus Lerdorf <rasmus@php.net> | 2013-08-02 16:23:52 -0400 |
---|---|---|
committer | Rasmus Lerdorf <rasmus@php.net> | 2013-08-02 16:23:52 -0400 |
commit | 9fa7e8932d53f4a9e929cbabc7bf05fd33aa2545 (patch) | |
tree | ec2be3ded2665e3dfa7ff9c602b1c3f378b56a45 /ext/pcntl | |
parent | 4e90145932add60de5f0cc52fcd82bf1b3ca23ed (diff) | |
parent | a03f0943ca0384b37083d371b121f23ad2054a83 (diff) | |
download | php-git-9fa7e8932d53f4a9e929cbabc7bf05fd33aa2545.tar.gz |
Merge commit 'a03f094'
* commit 'a03f094':
We shouldn't load any local ini files for these tests
Diffstat (limited to 'ext/pcntl')
-rw-r--r-- | ext/pcntl/tests/pcntl_exec.phpt | 2 | ||||
-rw-r--r-- | ext/pcntl/tests/pcntl_exec_2.phpt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/pcntl/tests/pcntl_exec.phpt b/ext/pcntl/tests/pcntl_exec.phpt index 9d2ec1dcf5..9a2c96ea38 100644 --- a/ext/pcntl/tests/pcntl_exec.phpt +++ b/ext/pcntl/tests/pcntl_exec.phpt @@ -8,7 +8,7 @@ if (!getenv("TEST_PHP_EXECUTABLE") || !is_executable(getenv("TEST_PHP_EXECUTABLE --FILE-- <?php echo "ok\n"; -pcntl_exec(getenv("TEST_PHP_EXECUTABLE")); +pcntl_exec(getenv("TEST_PHP_EXECUTABLE"), ['-n']); echo "nok\n"; ?> --EXPECT-- diff --git a/ext/pcntl/tests/pcntl_exec_2.phpt b/ext/pcntl/tests/pcntl_exec_2.phpt index 02b5e22aa4..e18527dba0 100644 --- a/ext/pcntl/tests/pcntl_exec_2.phpt +++ b/ext/pcntl/tests/pcntl_exec_2.phpt @@ -14,7 +14,7 @@ if (getenv("PCNTL_EXEC_TEST_IS_CHILD")) { exit; } echo "ok\n"; -pcntl_exec(getenv("TEST_PHP_EXECUTABLE"), array(__FILE__), array( +pcntl_exec(getenv("TEST_PHP_EXECUTABLE"), array('-n', __FILE__), array( b"PCNTL_EXEC_TEST_IS_CHILD" => b"1", b"FOO" => b"BAR", 1 => b"long") |