jani            Thu Aug 14 23:44:30 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/standard/tests/file    bug26615.phpt bug26938.phpt 
                                        proc_open01.phpt 
  Log:
  MFH: fix tests
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug26615.phpt?r1=1.4.4.1&r2=1.4.4.1.2.1&diff_format=u
Index: php-src/ext/standard/tests/file/bug26615.phpt
diff -u php-src/ext/standard/tests/file/bug26615.phpt:1.4.4.1 
php-src/ext/standard/tests/file/bug26615.phpt:1.4.4.1.2.1
--- php-src/ext/standard/tests/file/bug26615.phpt:1.4.4.1       Wed Apr 18 
14:51:29 2007
+++ php-src/ext/standard/tests/file/bug26615.phpt       Thu Aug 14 23:44:29 2008
@@ -7,9 +7,9 @@
 $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);
 ?>
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug26938.phpt?r1=1.1.8.1&r2=1.1.8.1.2.1&diff_format=u
Index: php-src/ext/standard/tests/file/bug26938.phpt
diff -u php-src/ext/standard/tests/file/bug26938.phpt:1.1.8.1 
php-src/ext/standard/tests/file/bug26938.phpt:1.1.8.1.2.1
--- php-src/ext/standard/tests/file/bug26938.phpt:1.1.8.1       Wed Apr 18 
14:51:29 2007
+++ php-src/ext/standard/tests/file/bug26938.phpt       Thu Aug 14 23:44:29 2008
@@ -6,14 +6,14 @@
 $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);'
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/proc_open01.phpt?r1=1.3.4.1.2.1&r2=1.3.4.1.2.1.2.1&diff_format=u
Index: php-src/ext/standard/tests/file/proc_open01.phpt
diff -u php-src/ext/standard/tests/file/proc_open01.phpt:1.3.4.1.2.1 
php-src/ext/standard/tests/file/proc_open01.phpt:1.3.4.1.2.1.2.1
--- php-src/ext/standard/tests/file/proc_open01.phpt:1.3.4.1.2.1        Fri Mar 
 2 18:54:13 2007
+++ php-src/ext/standard/tests/file/proc_open01.phpt    Thu Aug 14 23:44:29 2008
@@ -9,7 +9,7 @@
        die("no php executable defined");
 } 
 $proc = proc_open(
-       $php,
+       "$php -n",
        array(0 => array('pipe', 'r'), 1 => array('pipe', 'w')),
        $pipes
 );



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to