stas                                     Mon, 23 May 2011 07:06:04 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=311344

Log:
fix some failing tests

Changed paths:
    U   php/php-src/branches/PHP_5_4/ext/standard/tests/file/005_variation2.phpt
    U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/umask_variation3.phpt
    U   php/php-src/trunk/ext/standard/tests/file/005_variation2.phpt
    U   php/php-src/trunk/ext/standard/tests/file/umask_variation3.phpt

Modified: 
php/php-src/branches/PHP_5_4/ext/standard/tests/file/005_variation2.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/005_variation2.phpt    
2011-05-23 03:25:05 UTC (rev 311343)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/005_variation2.phpt    
2011-05-23 07:06:04 UTC (rev 311344)
@@ -71,14 +71,8 @@
 *** Testing fileattime(), filemtime(), filectime() & touch() : usage 
variations ***

 *** testing touch ***
-
-Warning: touch(): Unable to create file  because %s in %s on line %d
 bool(false)
-
-Warning: touch(): Unable to create file  because %s in %s on line %d
 bool(false)
-
-Warning: touch(): Unable to create file  because %s in %s on line %d
 bool(false)
 bool(true)
 bool(true)

Modified: 
php/php-src/branches/PHP_5_4/ext/standard/tests/file/umask_variation3.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/umask_variation3.phpt  
2011-05-23 03:25:05 UTC (rev 311343)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/umask_variation3.phpt  
2011-05-23 07:06:04 UTC (rev 311344)
@@ -11,9 +11,9 @@
 --FILE--
 <?php
 /* Prototype  : int umask([int mask])
- * Description: Return or change the umask
+ * Description: Return or change the umask
  * Source code: ext/standard/file.c
- * Alias to functions:
+ * Alias to functions:
  */

 echo "*** Testing umask() : usage variation ***\n";
@@ -110,7 +110,7 @@
       echo "\n--$key--\n";
       umask(0);
       var_dump(umask($value));
-      var_dump( umask());
+      var_dump( umask() & 0777);
 };

 ?>

Modified: php/php-src/trunk/ext/standard/tests/file/005_variation2.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/005_variation2.phpt       
2011-05-23 03:25:05 UTC (rev 311343)
+++ php/php-src/trunk/ext/standard/tests/file/005_variation2.phpt       
2011-05-23 07:06:04 UTC (rev 311344)
@@ -71,14 +71,8 @@
 *** Testing fileattime(), filemtime(), filectime() & touch() : usage 
variations ***

 *** testing touch ***
-
-Warning: touch(): Unable to create file  because %s in %s on line %d
 bool(false)
-
-Warning: touch(): Unable to create file  because %s in %s on line %d
 bool(false)
-
-Warning: touch(): Unable to create file  because %s in %s on line %d
 bool(false)
 bool(true)
 bool(true)

Modified: php/php-src/trunk/ext/standard/tests/file/umask_variation3.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/umask_variation3.phpt     
2011-05-23 03:25:05 UTC (rev 311343)
+++ php/php-src/trunk/ext/standard/tests/file/umask_variation3.phpt     
2011-05-23 07:06:04 UTC (rev 311344)
@@ -11,9 +11,9 @@
 --FILE--
 <?php
 /* Prototype  : int umask([int mask])
- * Description: Return or change the umask
+ * Description: Return or change the umask
  * Source code: ext/standard/file.c
- * Alias to functions:
+ * Alias to functions:
  */

 echo "*** Testing umask() : usage variation ***\n";
@@ -110,7 +110,7 @@
       echo "\n--$key--\n";
       umask(0);
       var_dump(umask($value));
-      var_dump( umask());
+      var_dump( umask() & 0777);
 };

 ?>

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

Reply via email to