summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJani Taskinen <jani@php.net>2008-08-14 23:43:21 +0000
committerJani Taskinen <jani@php.net>2008-08-14 23:43:21 +0000
commit48442e4ab896181ecce7f3b286a2dbc7d4b2f260 (patch)
tree3d0cc72c51d8d8bf02130344a4b09f96d2fd7409
parentf4fdb1ce27ad515a6f13622a912e14f921488d42 (diff)
downloadphp-git-48442e4ab896181ecce7f3b286a2dbc7d4b2f260.tar.gz
- Fix tests
-rw-r--r--ext/standard/tests/file/bug26615.phpt4
-rw-r--r--ext/standard/tests/file/bug26938.phpt4
-rw-r--r--ext/standard/tests/file/proc_open01.phpt2
3 files changed, 5 insertions, 5 deletions
diff --git a/ext/standard/tests/file/bug26615.phpt b/ext/standard/tests/file/bug26615.phpt
index 4de8b4a463..9fee92a69e 100644
--- a/ext/standard/tests/file/bug26615.phpt
+++ b/ext/standard/tests/file/bug26615.phpt
@@ -7,9 +7,9 @@ variables_order=E
$out = array();
$status = -1;
if (substr(PHP_OS, 0, 3) != 'WIN') {
- exec($_ENV['TEST_PHP_EXECUTABLE'].' -r \'for($i=1;$i<=5000;$i++) print "$i\n";\' | tr \'\n\' \' \'', $out, $status);
+ exec($_ENV['TEST_PHP_EXECUTABLE'].' -n -r \'for($i=1;$i<=5000;$i++) print "$i\n";\' | tr \'\n\' \' \'', $out, $status);
} else {
- exec($_ENV['TEST_PHP_EXECUTABLE'].' -r "for($i=1;$i<=5000;$i++) echo $i,\' \';"', $out, $status);
+ exec($_ENV['TEST_PHP_EXECUTABLE'].' -n -r "for($i=1;$i<=5000;$i++) echo $i,\' \';"', $out, $status);
}
print_r($out);
?>
diff --git a/ext/standard/tests/file/bug26938.phpt b/ext/standard/tests/file/bug26938.phpt
index c43e6b1033..a68d5728d7 100644
--- a/ext/standard/tests/file/bug26938.phpt
+++ b/ext/standard/tests/file/bug26938.phpt
@@ -6,14 +6,14 @@ $out = array();
$status = -1;
$php = getenv('TEST_PHP_EXECUTABLE');
if (substr(PHP_OS, 0, 3) != 'WIN') {
- exec($php . ' -r \''
+ exec($php . ' -n -r \''
. '$lengths = array(10,20000,10000,5,10000,3);'
. 'foreach($lengths as $length) {'
. ' for($i=0;$i<$length;$i++) print chr(65+$i % 27);'
. ' print "\n";'
. '}\'', $out, $status);
} else {
- exec($php . ' -r "'
+ exec($php . ' -n -r "'
. '$lengths = array(10,20000,10000,5,10000,3);'
. 'foreach($lengths as $length) {'
. ' for($i=0;$i<$length;$i++) print chr(65+$i % 27);'
diff --git a/ext/standard/tests/file/proc_open01.phpt b/ext/standard/tests/file/proc_open01.phpt
index 2c211f6167..3c64908eb5 100644
--- a/ext/standard/tests/file/proc_open01.phpt
+++ b/ext/standard/tests/file/proc_open01.phpt
@@ -9,7 +9,7 @@ if ($php === false) {
die("no php executable defined");
}
$proc = proc_open(
- $php,
+ "$php -n",
array(0 => array('pipe', 'r'), 1 => array('pipe', 'w')),
$pipes
);