Merge commit 'a03f094' into PHP-5.5

rlerdorf · rlerdorf · commit f17f596b2781 · 2013-08-02T16:23:44.000-04:00
* commit 'a03f094':
  We shouldn't load any local ini files for these tests
diff --git 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
@@ -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")

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ if (getenv("PCNTL_EXEC_TEST_IS_CHILD")) {`
`14`	`14`	`exit;`
`15`	`15`	`}`
`16`	`16`	`echo "ok\n";`
`17`		`-pcntl_exec(getenv("TEST_PHP_EXECUTABLE"), array(__FILE__), array(`
	`17`	`+pcntl_exec(getenv("TEST_PHP_EXECUTABLE"), array('-n', __FILE__), array(`
`18`	`18`	`b"PCNTL_EXEC_TEST_IS_CHILD" => b"1",`
`19`	`19`	`b"FOO" => b"BAR",`
`20`	`20`	`1 => b"long")`