com php-src: We shouldn't load any local ini files for these tests: ext/pcntl/tests/pcntl_exec.phpt ext/pcntl/tests/pcntl_e xec_2.phpt
| From: | Rasmus Lerdorf | Date: | Fri, 02 Aug 2013 20:23:18 +0000 |
| Subject: | com php-src: We shouldn't load any local ini files for these tests: ext/pcntl/tests/pcntl_exec.phpt ext/pcntl/tests/pcntl_e xec_2.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-72817@lists.php.net to get a copy of this message | ||
Commit: a03f0943ca0384b37083d371b121f23ad2054a83
Author: Rasmus Lerdorf <rasmus@php.net> Fri, 2 Aug 2013 16:23:18 -0400
Parents: d60e168a7a73b1bd311754943856c1598d1cd9dc
Branches: PHP-5.4 PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a03f0943ca0384b37083d371b121f23ad2054a83
Log:
We shouldn't load any local ini files for these tests
Changed paths:
M ext/pcntl/tests/pcntl_exec.phpt
M ext/pcntl/tests/pcntl_exec_2.phpt
Diff:
diff --git a/ext/pcntl/tests/pcntl_exec.phpt b/ext/pcntl/tests/pcntl_exec.phpt
index 9d2ec1d..9a2c96e 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 02b5e22..e18527d 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")